diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 5bf4f5c09819b601eae9f5e2178b266c28dc730a..95c0723f254d115556c9e0c0ccf193f75a28682d 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -334,8 +334,13 @@ $(document).ready(function() {
var result=$.parseJSON(response);
delete data.jqXHR;
-
- if (typeof result[0] === 'undefined') {
+
+ if (result.status === 'error' && result.data && result.data.message){
+ data.textStatus = 'servererror';
+ data.errorThrown = result.data.message;
+ var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+ fu._trigger('fail', e, data);
+ } else if (typeof result[0] === 'undefined') {
data.textStatus = 'servererror';
data.errorThrown = t('files', 'Could not get result from server.');
var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
index 810a9fdd8d18b01fb0ac3c4b5b4c4d3586806cfe..f5ac11b2168f3f32f4fd11d71671e297d810594b 100644
--- a/apps/files/lib/app.php
+++ b/apps/files/lib/app.php
@@ -57,7 +57,7 @@ class App {
// rename to "/Shared" is denied
if( $dir === '/' and $newname === 'Shared' ) {
$result['data'] = array(
- 'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+ 'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved.")
);
// rename to existing file is denied
} else if ($this->view->file_exists($dir . '/' . $newname)) {
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 8eff978cde095970f24eb93f8253b2ce397b8223..e654255c40771c10575421279496b6ae0882c220 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -88,7 +88,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$result = $this->files->rename($dir, $oldname, $newname);
$expected = array(
'success' => false,
- 'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+ 'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved.")
);
$this->assertEquals($expected, $result);
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index 61574edf5098dc05db9614f2cabecebd76673983..317cea05a128cc8a8cc930c3066c12a266486dc4 100644
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@@ -12,7 +12,8 @@ if (!isset($_)) { //also provide standalone error page
$errorMsg = $l->t('Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app.');
break;
case \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR:
- $errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.');
+ $theme = new OC_Defaults();
+ $errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.', array($theme->getName()));
break;
case \OCA\Encryption\Crypt::ENCRYPTION_NO_SHARE_KEY_FOUND:
$errorMsg = $l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 6e2d360917bc1fc30525d69788c88616e318c36d..35574b8e5b9798c5755eb42bfc4aebe2f3fa50b0 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -35,6 +35,12 @@ class Hooks {
* @note This method should never be called for users using client side encryption
*/
public static function login($params) {
+
+ if (\OCP\App::isEnabled('files_encryption') === false) {
+ return true;
+ }
+
+
$l = new \OC_L10N('files_encryption');
$view = new \OC_FilesystemView('/');
@@ -117,11 +123,12 @@ class Hooks {
* @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']);
+ if (\OCP\App::isEnabled('files_encryption')) {
+ $view = new \OC_FilesystemView('/');
+ $util = new Util($view, $params['uid']);
+ Helper::setupUser($util, $params['password']);
+ }
}
/**
@@ -129,26 +136,31 @@ class Hooks {
* @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';
+ if (\OCP\App::isEnabled('files_encryption')) {
+ $view = new \OC_FilesystemView('/');
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // cleanup public key
+ $publicKey = '/public-keys/' . $params['uid'] . '.public.key';
- $view->unlink($publicKey);
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- \OC_FileProxy::$enabled = $proxyStatus;
+ $view->unlink($publicKey);
+
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
}
/**
* @brief If the password can't be changed within ownCloud, than update the key password in advance.
*/
public static function preSetPassphrase($params) {
- if ( ! \OC_User::canUserChangePassword($params['uid']) ) {
- self::setPassphrase($params);
+ if (\OCP\App::isEnabled('files_encryption')) {
+ if ( ! \OC_User::canUserChangePassword($params['uid']) ) {
+ self::setPassphrase($params);
+ }
}
}
@@ -157,6 +169,11 @@ class Hooks {
* @param array $params keys: uid, password
*/
public static function setPassphrase($params) {
+
+ if (\OCP\App::isEnabled('files_encryption') === false) {
+ return true;
+ }
+
// Only attempt to change passphrase if server-side encryption
// is in use (client-side encryption does not have access to
// the necessary keys)
@@ -227,6 +244,10 @@ class Hooks {
*/
public static function preShared($params) {
+ if (\OCP\App::isEnabled('files_encryption') === false) {
+ return true;
+ }
+
$l = new \OC_L10N('files_encryption');
$users = array();
$view = new \OC\Files\View('/public-keys/');
@@ -278,6 +299,10 @@ class Hooks {
// [run] => whether emitting script should continue to run
// TODO: Should other kinds of item be encrypted too?
+ if (\OCP\App::isEnabled('files_encryption') === false) {
+ return true;
+ }
+
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
$view = new \OC_FilesystemView('/');
@@ -372,6 +397,10 @@ class Hooks {
// [shareWith] => test1
// [itemParent] =>
+ if (\OCP\App::isEnabled('files_encryption') === false) {
+ return true;
+ }
+
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
$view = new \OC_FilesystemView('/');
@@ -453,6 +482,11 @@ class Hooks {
* of the stored versions along the actual file
*/
public static function postRename($params) {
+
+ if (\OCP\App::isEnabled('files_encryption') === false) {
+ return true;
+ }
+
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php
index 5367605898262f3d66b0e83a5aa9c06859fa8182..9ad9bfb88770a2fe00953bbaf27fdf5bf9223aeb 100644
--- a/apps/files_encryption/settings-admin.php
+++ b/apps/files_encryption/settings-admin.php
@@ -11,9 +11,7 @@
$tmpl = new OCP\Template('files_encryption', 'settings-admin');
// Check if an adminRecovery account is enabled for recovering files after lost pwd
-$view = new OC_FilesystemView('');
-
-$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
+$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled', '0');
$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
diff --git a/apps/files_external/3rdparty/php-opencloud/LICENSE b/apps/files_external/3rdparty/php-opencloud/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..f7c56967e6c0af437576b7e3031e8a14291a4cd6
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/LICENSE
@@ -0,0 +1,16 @@
+ Copyright 2012-2013 Rackspace US, Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ All contributions to this repository are covered under the same license,
+ terms, and conditions.
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/Autoload.php b/apps/files_external/3rdparty/php-opencloud/lib/Autoload.php
new file mode 100644
index 0000000000000000000000000000000000000000..32e9dc24b7e36da02280a67d46c9b3b713fb9317
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/Autoload.php
@@ -0,0 +1,296 @@
+<?php
+
+// Copyright (c) 2004-2013 Fabien Potencier
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is furnished
+// to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+class ClassLoader
+{
+ private $namespaces = array();
+ private $prefixes = array();
+ private $namespaceFallbacks = array();
+ private $prefixFallbacks = array();
+ private $useIncludePath = false;
+
+ /**
+ * Turns on searching the include for class files. Allows easy loading
+ * of installed PEAR packages
+ *
+ * @param Boolean $useIncludePath
+ */
+ public function useIncludePath($useIncludePath)
+ {
+ $this->useIncludePath = $useIncludePath;
+ }
+
+ /**
+ * Can be used to check if the autoloader uses the include path to check
+ * for classes.
+ *
+ * @return Boolean
+ */
+ public function getUseIncludePath()
+ {
+ return $this->useIncludePath;
+ }
+
+ /**
+ * Gets the configured namespaces.
+ *
+ * @return array A hash with namespaces as keys and directories as values
+ */
+ public function getNamespaces()
+ {
+ return $this->namespaces;
+ }
+
+ /**
+ * Gets the configured class prefixes.
+ *
+ * @return array A hash with class prefixes as keys and directories as values
+ */
+ public function getPrefixes()
+ {
+ return $this->prefixes;
+ }
+
+ /**
+ * Gets the directory(ies) to use as a fallback for namespaces.
+ *
+ * @return array An array of directories
+ */
+ public function getNamespaceFallbacks()
+ {
+ return $this->namespaceFallbacks;
+ }
+
+ /**
+ * Gets the directory(ies) to use as a fallback for class prefixes.
+ *
+ * @return array An array of directories
+ */
+ public function getPrefixFallbacks()
+ {
+ return $this->prefixFallbacks;
+ }
+
+ /**
+ * Registers the directory to use as a fallback for namespaces.
+ *
+ * @param array $dirs An array of directories
+ *
+ * @api
+ */
+ public function registerNamespaceFallbacks(array $dirs)
+ {
+ $this->namespaceFallbacks = $dirs;
+ }
+
+ /**
+ * Registers a directory to use as a fallback for namespaces.
+ *
+ * @param string $dir A directory
+ */
+ public function registerNamespaceFallback($dir)
+ {
+ $this->namespaceFallbacks[] = $dir;
+ }
+
+ /**
+ * Registers directories to use as a fallback for class prefixes.
+ *
+ * @param array $dirs An array of directories
+ *
+ * @api
+ */
+ public function registerPrefixFallbacks(array $dirs)
+ {
+ $this->prefixFallbacks = $dirs;
+ }
+
+ /**
+ * Registers a directory to use as a fallback for class prefixes.
+ *
+ * @param string $dir A directory
+ */
+ public function registerPrefixFallback($dir)
+ {
+ $this->prefixFallbacks[] = $dir;
+ }
+
+ /**
+ * Registers an array of namespaces
+ *
+ * @param array $namespaces An array of namespaces (namespaces as keys and locations as values)
+ *
+ * @api
+ */
+ public function registerNamespaces(array $namespaces)
+ {
+ foreach ($namespaces as $namespace => $locations) {
+ $this->namespaces[$namespace] = (array) $locations;
+ }
+ }
+
+ /**
+ * Registers a namespace.
+ *
+ * @param string $namespace The namespace
+ * @param array|string $paths The location(s) of the namespace
+ *
+ * @api
+ */
+ public function registerNamespace($namespace, $paths)
+ {
+ $this->namespaces[$namespace] = (array) $paths;
+ }
+
+ /**
+ * Registers an array of classes using the PEAR naming convention.
+ *
+ * @param array $classes An array of classes (prefixes as keys and locations as values)
+ *
+ * @api
+ */
+ public function registerPrefixes(array $classes)
+ {
+ foreach ($classes as $prefix => $locations) {
+ $this->prefixes[$prefix] = (array) $locations;
+ }
+ }
+
+ /**
+ * Registers a set of classes using the PEAR naming convention.
+ *
+ * @param string $prefix The classes prefix
+ * @param array|string $paths The location(s) of the classes
+ *
+ * @api
+ */
+ public function registerPrefix($prefix, $paths)
+ {
+ $this->prefixes[$prefix] = (array) $paths;
+ }
+
+ /**
+ * Registers this instance as an autoloader.
+ *
+ * @param Boolean $prepend Whether to prepend the autoloader or not
+ *
+ * @api
+ */
+ public function register($prepend = false)
+ {
+ spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+ }
+
+ /**
+ * Fix for certain versions of PHP that have trouble with
+ * namespaces with leading separators.
+ *
+ * @access private
+ * @param mixed $className
+ * @return void
+ */
+ private function makeBackwardsCompatible($className)
+ {
+ return (phpversion() < '5.3.3') ? ltrim($className, '\\') : $className;
+ }
+
+ /**
+ * Loads the given class or interface.
+ *
+ * @param string $class The name of the class
+ *
+ * @return Boolean|null True, if loaded
+ */
+ public function loadClass($class)
+ {
+ $class = $this->makeBackwardsCompatible($class);
+
+ if ($file = $this->findFile($class)) {
+ require $file;
+
+ return true;
+ }
+ }
+
+ /**
+ * Finds the path to the file where the class is defined.
+ *
+ * @param string $class The name of the class
+ *
+ * @return string|null The path, if found
+ */
+ public function findFile($class)
+ {
+ if (false !== $pos = strrpos($class, '\\')) {
+ // namespaced class name
+ $namespace = substr($class, 0, $pos);
+ $className = substr($class, $pos + 1);
+ $normalizedClass = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
+ foreach ($this->namespaces as $ns => $dirs) {
+ if (0 !== strpos($namespace, $ns)) {
+ continue;
+ }
+
+ foreach ($dirs as $dir) {
+ $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
+ if (is_file($file)) {
+ return $file;
+ }
+ }
+ }
+
+ foreach ($this->namespaceFallbacks as $dir) {
+ $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
+ if (is_file($file)) {
+ return $file;
+ }
+ }
+
+ } else {
+ // PEAR-like class name
+ $normalizedClass = str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
+ foreach ($this->prefixes as $prefix => $dirs) {
+ if (0 !== strpos($class, $prefix)) {
+ continue;
+ }
+
+ foreach ($dirs as $dir) {
+ $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
+ if (is_file($file)) {
+ return $file;
+ }
+ }
+ }
+
+ foreach ($this->prefixFallbacks as $dir) {
+ $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
+ if (is_file($file)) {
+ return $file;
+ }
+ }
+ }
+
+ if ($this->useIncludePath && $file = stream_resolve_include_path($normalizedClass)) {
+ return $file;
+ }
+ }
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Base.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Base.php
new file mode 100644
index 0000000000000000000000000000000000000000..f80c9320e2ac67e7c2e9f6c7ecc85f6a65d3479f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Base.php
@@ -0,0 +1,301 @@
+<?php
+/**
+ * @copyright 2012-2013 Rackspace Hosting, Inc.
+ * See COPYING for licensing information
+ * @package phpOpenCloud
+ * @version 1.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\Common;
+
+use OpenCloud\Common\Lang;
+use OpenCloud\Common\Exceptions\AttributeError;
+use OpenCloud\Common\Exceptions\JsonError;
+use OpenCloud\Common\Exceptions\UrlError;
+
+/**
+ * The root class for all other objects used or defined by this SDK.
+ *
+ * It contains common code for error handling as well as service functions that
+ * are useful. Because it is an abstract class, it cannot be called directly,
+ * and it has no publicly-visible properties.
+ */
+abstract class Base
+{
+
+ private $http_headers = array();
+ private $_errors = array();
+
+ /**
+ * Debug status.
+ *
+ * @var LoggerInterface
+ * @access private
+ */
+ private $logger;
+
+ /**
+ * Sets the Logger object.
+ *
+ * @param \OpenCloud\Common\Log\LoggerInterface $logger
+ */
+ public function setLogger(Log\LoggerInterface $logger)
+ {
+ $this->logger = $logger;
+ }
+
+ /**
+ * Returns the Logger object.
+ *
+ * @return \OpenCloud\Common\Log\AbstractLogger
+ */
+ public function getLogger()
+ {
+ if (null === $this->logger) {
+ $this->setLogger(new Log\Logger);
+ }
+ return $this->logger;
+ }
+
+ /**
+ * Returns the URL of the service/object
+ *
+ * The assumption is that nearly all objects will have a URL; at this
+ * base level, it simply throws an exception to enforce the idea that
+ * subclasses need to define this method.
+ *
+ * @throws UrlError
+ */
+ public function url($subresource = '')
+ {
+ throw new UrlError(Lang::translate(
+ 'URL method must be overridden in class definition'
+ ));
+ }
+
+/**
+ * Populates the current object based on an unknown data type.
+ *
+ * @param array|object|string|integer $info
+ * @throws Exceptions\InvalidArgumentError
+ */
+ public function populate($info, $setObjects = true)
+ {
+ if (is_string($info) || is_integer($info)) {
+
+ // If the data type represents an ID, the primary key is set
+ // and we retrieve the full resource from the API
+ $this->{$this->primaryKeyField()} = (string) $info;
+ $this->refresh($info);
+
+ } elseif (is_object($info) || is_array($info)) {
+
+ foreach($info as $key => $value) {
+
+ if ($key == 'metadata' || $key == 'meta') {
+
+ if (empty($this->metadata) || !$this->metadata instanceof Metadata) {
+ $this->metadata = new Metadata;
+ }
+
+ // Metadata
+ $this->$key->setArray($value);
+
+ } elseif (!empty($this->associatedResources[$key]) && $setObjects === true) {
+
+ // Associated resource
+ try {
+ $resource = $this->service()->resource($this->associatedResources[$key], $value);
+ $resource->setParent($this);
+ $this->$key = $resource;
+ } catch (Exception\ServiceException $e) {}
+
+ } elseif (!empty($this->associatedCollections[$key]) && $setObjects === true) {
+
+ // Associated collection
+ try {
+ $this->$key = $this->service()->resourceList($this->associatedCollections[$key], null, $this);
+ } catch (Exception\ServiceException $e) {}
+
+ } else {
+
+ // Normal key/value pair
+ $this->$key = $value;
+ }
+ }
+ } elseif (null !== $info) {
+ throw new Exceptions\InvalidArgumentError(sprintf(
+ Lang::translate('Argument for [%s] must be string or object'),
+ get_class()
+ ));
+ }
+ }
+
+ /**
+ * Sets extended attributes on an object and validates them
+ *
+ * This function is provided to ensure that attributes cannot
+ * arbitrarily added to an object. If this function is called, it
+ * means that the attribute is not defined on the object, and thus
+ * an exception is thrown.
+ *
+ * @codeCoverageIgnore
+ *
+ * @param string $property the name of the attribute
+ * @param mixed $value the value of the attribute
+ * @return void
+ */
+ public function __set($property, $value)
+ {
+ $this->setProperty($property, $value);
+ }
+
+ /**
+ * Sets an extended (unrecognized) property on the current object
+ *
+ * If RAXSDK_STRICT_PROPERTY_CHECKS is TRUE, then the prefix of the
+ * property name must appear in the $prefixes array, or else an
+ * exception is thrown.
+ *
+ * @param string $property the property name
+ * @param mixed $value the value of the property
+ * @param array $prefixes optional list of supported prefixes
+ * @throws \OpenCloud\AttributeError if strict checks are on and
+ * the property prefix is not in the list of prefixes.
+ */
+ public function setProperty($property, $value, array $prefixes = array())
+ {
+ // if strict checks are off, go ahead and set it
+ if (!RAXSDK_STRICT_PROPERTY_CHECKS
+ || $this->checkAttributePrefix($property, $prefixes)
+ ) {
+ $this->$property = $value;
+ } else {
+ // if that fails, then throw the exception
+ throw new AttributeError(sprintf(
+ Lang::translate('Unrecognized attribute [%s] for [%s]'),
+ $property,
+ get_class($this)
+ ));
+ }
+ }
+
+ /**
+ * Converts an array of key/value pairs into a single query string
+ *
+ * For example, array('A'=>1,'B'=>2) would become 'A=1&B=2'.
+ *
+ * @param array $arr array of key/value pairs
+ * @return string
+ */
+ public function makeQueryString($array)
+ {
+ $queryString = '';
+
+ foreach($array as $key => $value) {
+ if ($queryString) {
+ $queryString .= '&';
+ }
+ $queryString .= urlencode($key) . '=' . urlencode($this->to_string($value));
+ }
+
+ return $queryString;
+ }
+
+ /**
+ * Checks the most recent JSON operation for errors
+ *
+ * This function should be called after any `json_*()` function call.
+ * This ensures that nasty JSON errors are detected and the proper
+ * exception thrown.
+ *
+ * Example:
+ * `$obj = json_decode($string);`
+ * `if (check_json_error()) do something ...`
+ *
+ * @return boolean TRUE if an error occurred, FALSE if none
+ * @throws JsonError
+ *
+ * @codeCoverageIgnore
+ */
+ public function checkJsonError()
+ {
+ switch (json_last_error()) {
+ case JSON_ERROR_NONE:
+ return;
+ case JSON_ERROR_DEPTH:
+ $jsonError = 'JSON error: The maximum stack depth has been exceeded';
+ break;
+ case JSON_ERROR_STATE_MISMATCH:
+ $jsonError = 'JSON error: Invalid or malformed JSON';
+ break;
+ case JSON_ERROR_CTRL_CHAR:
+ $jsonError = 'JSON error: Control character error, possibly incorrectly encoded';
+ break;
+ case JSON_ERROR_SYNTAX:
+ $jsonError = 'JSON error: Syntax error';
+ break;
+ case JSON_ERROR_UTF8:
+ $jsonError = 'JSON error: Malformed UTF-8 characters, possibly incorrectly encoded';
+ break;
+ default:
+ $jsonError = 'Unexpected JSON error';
+ break;
+ }
+
+ if (isset($jsonError)) {
+ throw new JsonError(Lang::translate($jsonError));
+ }
+ }
+
+ /**
+ * Returns a class that implements the HttpRequest interface.
+ *
+ * This can be stubbed out for unit testing and avoid making live calls.
+ */
+ public function getHttpRequestObject($url, $method = 'GET', array $options = array())
+ {
+ return new Request\Curl($url, $method, $options);
+ }
+
+ /**
+ * Checks the attribute $property and only permits it if the prefix is
+ * in the specified $prefixes array
+ *
+ * This is to support extension namespaces in some services.
+ *
+ * @param string $property the name of the attribute
+ * @param array $prefixes a list of prefixes
+ * @return boolean TRUE if valid; FALSE if not
+ */
+ private function checkAttributePrefix($property, array $prefixes = array())
+ {
+ $prefix = strstr($property, ':', true);
+
+ if (in_array($prefix, $prefixes)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Converts a value to an HTTP-displayable string form
+ *
+ * @param mixed $x a value to convert
+ * @return string
+ */
+ private function to_string($x)
+ {
+ if (is_bool($x) && $x) {
+ return 'True';
+ } elseif (is_bool($x)) {
+ return 'False';
+ } else {
+ return (string) $x;
+ }
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Collection.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Collection.php
new file mode 100644
index 0000000000000000000000000000000000000000..e1bf80376e09174d2a96ef852c5963be17a60b6b
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Collection.php
@@ -0,0 +1,320 @@
+<?php
+
+namespace OpenCloud\Common;
+
+/**
+ * Provides an abstraction for working with ordered sets of objects
+ *
+ * Collection objects are used whenever there are multiples; for example,
+ * multiple objects in a container, or multiple servers in a service.
+ *
+ * @since 1.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+class Collection extends Base
+{
+
+ private $service;
+ private $itemclass;
+ private $itemlist = array();
+ private $pointer = 0;
+ private $sortkey;
+ private $next_page_class;
+ private $next_page_callback;
+ private $next_page_url;
+
+ /**
+ * A Collection is an array of objects
+ *
+ * Some assumptions:
+ * * The `Collection` class assumes that there exists on its service
+ * a factory method with the same name of the class. For example, if
+ * you create a Collection of class `Foobar`, it will attempt to call
+ * the method `parent::Foobar()` to create instances of that class.
+ * * It assumes that the factory method can take an array of values, and
+ * it passes that to the method.
+ *
+ * @param Service $service - the service associated with the collection
+ * @param string $itemclass - the Class of each item in the collection
+ * (assumed to be the name of the factory method)
+ * @param array $arr - the input array
+ */
+ public function __construct($service, $itemclass, $array)
+ {
+ $this->service = $service;
+
+ $this->getLogger()->info(
+ 'Collection:service={class}, class={itemClass}, array={array}',
+ array(
+ 'class' => get_class($service),
+ 'itemClass' => $itemclass,
+ 'array' => print_r($array, true)
+ )
+ );
+
+ $this->next_page_class = $itemclass;
+
+ if (false !== ($classNamePos = strrpos($itemclass, '\\'))) {
+ $this->itemclass = substr($itemclass, $classNamePos + 1);
+ } else {
+ $this->itemclass = $itemclass;
+ }
+
+ if (!is_array($array)) {
+ throw new Exceptions\CollectionError(
+ Lang::translate('Cannot create a Collection without an array')
+ );
+ }
+
+ // save the array of items
+ $this->setItemList($array);
+ }
+
+ /**
+ * Set the entire data array.
+ *
+ * @param array $array
+ */
+ public function setItemList(array $array)
+ {
+ $this->itemlist = $array;
+ }
+
+ /**
+ * Retrieve the entire data array.
+ *
+ * @return array
+ */
+ public function getItemList()
+ {
+ return $this->itemlist;
+ }
+
+ /**
+ * Returns the number of items in the collection
+ *
+ * For most services, this is the total number of items. If the Collection
+ * is paginated, however, this only returns the count of items in the
+ * current page of data.
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return count($this->itemlist);
+ }
+
+ /**
+ * Pseudonym for count()
+ *
+ * @codeCoverageIgnore
+ */
+ public function size()
+ {
+ return $this->count();
+ }
+
+ /**
+ * Retrieves the service associated with the Collection
+ *
+ * @return Service
+ */
+ public function service()
+ {
+ return $this->service;
+ }
+
+ /**
+ * Resets the pointer to the beginning, but does NOT return the first item
+ *
+ * @api
+ * @return void
+ */
+ public function reset()
+ {
+ $this->pointer = 0;
+ }
+
+ /**
+ * Resets the collection pointer back to the first item in the page
+ * and returns it
+ *
+ * This is useful if you're only interested in the first item in the page.
+ *
+ * @api
+ * @return Base the first item in the set
+ */
+ public function first()
+ {
+ $this->reset();
+ return $this->next();
+ }
+
+ /**
+ * Returns the next item in the page
+ *
+ * @api
+ * @return Base the next item or FALSE if at the end of the page
+ */
+ public function next()
+ {
+ if ($this->pointer >= $this->count()) {
+ return false;
+ }
+
+ $service = $this->service();
+
+ if (method_exists($service, $this->itemclass)) {
+ return $service->{$this->itemclass}($this->itemlist[$this->pointer++]);
+ } elseif (method_exists($service, 'resource')) {
+ return $service->resource($this->itemclass, $this->itemlist[$this->pointer++]);
+ }
+ // @codeCoverageIgnoreStart
+ return false;
+ // @codeCoverageIgnoreEnd
+ }
+
+ /**
+ * sorts the collection on a specified key
+ *
+ * Note: only top-level keys can be used as the sort key. Note that this
+ * only sorts the data in the current page of the Collection (for
+ * multi-page data).
+ *
+ * @api
+ * @param string $keyname the name of the field to use as the sort key
+ * @return void
+ */
+ public function sort($keyname = 'id')
+ {
+ $this->sortkey = $keyname;
+ usort($this->itemlist, array($this, 'sortCompare'));
+ }
+
+ /**
+ * selects only specified items from the Collection
+ *
+ * This provides a simple form of filtering on Collections. For each item
+ * in the collection, it calls the callback function, passing it the item.
+ * If the callback returns `TRUE`, then the item is retained; if it returns
+ * `FALSE`, then the item is deleted from the collection.
+ *
+ * Note that this should not supersede server-side filtering; the
+ * `Collection::Select()` method requires that *all* of the data for the
+ * Collection be retrieved from the server before the filtering is
+ * performed; this can be very inefficient, especially for large data
+ * sets. This method is mostly useful on smaller-sized sets.
+ *
+ * Example:
+ * <code>
+ * $services = $connection->ServiceList();
+ * $services->Select(function($item){ return $item->region=='ORD';});
+ * // now the $services Collection only has items from the ORD region
+ * </code>
+ *
+ * `Select()` is *destructive*; that is, it actually removes entries from
+ * the collection. For example, if you use `Select()` to find items with
+ * the ID > 10, then use it again to find items that are <= 10, it will
+ * return an empty list.
+ *
+ * @api
+ * @param callable $testfunc a callback function that is passed each item
+ * in turn. Note that `Select()` performs an explicit test for
+ * `FALSE`, so functions like `strpos()` need to be cast into a
+ * boolean value (and not just return the integer).
+ * @returns void
+ * @throws DomainError if callback doesn't return a boolean value
+ */
+ public function select($testfunc)
+ {
+ foreach ($this->getItemList() as $index => $item) {
+ $test = call_user_func($testfunc, $item);
+ if (!is_bool($test)) {
+ throw new Exceptions\DomainError(
+ Lang::translate('Callback function for Collection::Select() did not return boolean')
+ );
+ }
+ if ($test === false) {
+ unset($this->itemlist[$index]);
+ }
+ }
+ }
+
+ /**
+ * returns the Collection object for the next page of results, or
+ * FALSE if there are no more pages
+ *
+ * Generally, the structure for a multi-page collection will look like
+ * this:
+ *
+ * $coll = $obj->Collection();
+ * do {
+ * while($item = $coll->Next()) {
+ * // do something with the item
+ * }
+ * } while ($coll = $coll->NextPage());
+ *
+ * @api
+ * @return Collection if there are more pages of results, otherwise FALSE
+ */
+ public function nextPage()
+ {
+ if (isset($this->next_page_url)) {
+ return call_user_func(
+ $this->next_page_callback,
+ $this->next_page_class,
+ $this->next_page_url
+ );
+ }
+ // @codeCoverageIgnoreStart
+ return false;
+ // @codeCoverageIgnoreEnd
+ }
+
+ /**
+ * for paginated collection, sets the callback function and URL for
+ * the next page
+ *
+ * The callback function should have the signature:
+ *
+ * function Whatever($class, $url, $parent)
+ *
+ * and the `$url` should be the URL of the next page of results
+ *
+ * @param callable $callback the name of the function (or array of
+ * object, function name)
+ * @param string $url the URL of the next page of results
+ * @return void
+ */
+ public function setNextPageCallback($callback, $url)
+ {
+ $this->next_page_callback = $callback;
+ $this->next_page_url = $url;
+ }
+
+ /**
+ * Compares two values of sort keys
+ */
+ private function sortCompare($a, $b)
+ {
+ $key = $this->sortkey;
+
+ // handle strings with strcmp()
+ if (is_string($a->$key)) {
+ return strcmp($a->$key, $b->$key);
+ }
+
+ // handle others with logical comparisons
+ if ($a->$key == $b->$key) {
+ return 0;
+ }
+
+ if ($a->$key < $b->$key) {
+ return -1;
+ } else {
+ return 1;
+ }
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AsyncError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AsyncError.php
new file mode 100644
index 0000000000000000000000000000000000000000..cbbacff38bdf523f820cb3482862483eb57043ae
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AsyncError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class AsyncError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AsyncHttpError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AsyncHttpError.php
new file mode 100644
index 0000000000000000000000000000000000000000..dc7b2d7e3a7826411059ced0d1358dda7ddb6b40
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AsyncHttpError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class AsyncHttpError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AsyncTimeoutError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AsyncTimeoutError.php
new file mode 100644
index 0000000000000000000000000000000000000000..bba5f09f64fc6bfc23815435c35f99452ea5cdb1
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AsyncTimeoutError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class AsyncTimeoutError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AttributeError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AttributeError.php
new file mode 100644
index 0000000000000000000000000000000000000000..7d09ceb0147f86df9db19135440307c0f10fbe14
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AttributeError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class AttributeError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AuthenticationError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AuthenticationError.php
new file mode 100644
index 0000000000000000000000000000000000000000..091e4602ec04e1e0597f6520fb4a85f1a1c30215
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/AuthenticationError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class AuthenticationError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/BaseException.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/BaseException.php
new file mode 100644
index 0000000000000000000000000000000000000000..0bc967adf67b35304da1e2062111117f8b167bf0
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/BaseException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class BaseException extends \Exception
+{
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnError.php
new file mode 100644
index 0000000000000000000000000000000000000000..0f972e9c5c763bdfbe923b112521a4cb1226aa32
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class CdnError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnHttpError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnHttpError.php
new file mode 100644
index 0000000000000000000000000000000000000000..f1e2722f15893b380b0af5359e670f803ade14cc
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnHttpError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class CdnHttpError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnNotAvailableError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnNotAvailableError.php
new file mode 100644
index 0000000000000000000000000000000000000000..853b17c7127464a6ebf88853f86eac6a8132570a
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnNotAvailableError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class CdnNotAvailableError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnTtlError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnTtlError.php
new file mode 100644
index 0000000000000000000000000000000000000000..b4364f93467633ed29daf8e383719b8cd996a7ff
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CdnTtlError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class CdnTtlError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CollectionError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CollectionError.php
new file mode 100644
index 0000000000000000000000000000000000000000..9d5030403f606499ad6f00d0bc96d7e72bfd123d
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CollectionError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class CollectionError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerCreateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerCreateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..afc8119bd5a32fc9e8074492fad834267c2d5606
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerCreateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ContainerCreateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerDeleteError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerDeleteError.php
new file mode 100644
index 0000000000000000000000000000000000000000..c212bfbaffdb8aef84072522b3862b29400b7ed9
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerDeleteError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ContainerDeleteError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerError.php
new file mode 100644
index 0000000000000000000000000000000000000000..c9716fef075c2ca34d2d0da631ef1fc60fcf6b4a
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ContainerError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerNameError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerNameError.php
new file mode 100644
index 0000000000000000000000000000000000000000..e0b9592835ea92d4cadf22bec18fa62caa8d8eeb
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerNameError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ContainerNameError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerNotEmptyError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerNotEmptyError.php
new file mode 100644
index 0000000000000000000000000000000000000000..e987449d4442a4f5dc0239766e6e45540e00c242
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerNotEmptyError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ContainerNotEmptyError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerNotFoundError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerNotFoundError.php
new file mode 100644
index 0000000000000000000000000000000000000000..2e700dbe0399b019edc30a01c33db92d6943f76a
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ContainerNotFoundError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ContainerNotFoundError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CreateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CreateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb2030373fb9883512063d5e893103d02091ab0e
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CreateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class CreateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CreateUpdateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CreateUpdateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..8aa651a76d94f5d74fe652ebd2cfb076d3d02aeb
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CreateUpdateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class CreateUpdateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CredentialError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CredentialError.php
new file mode 100644
index 0000000000000000000000000000000000000000..2769edaf3780678e21b1c13b1adea871f0daec0e
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/CredentialError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class CredentialError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseCreateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseCreateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..eb19198c2fe061e5efc67c7440a4d9b8a959ead9
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseCreateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class DatabaseCreateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseDeleteError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseDeleteError.php
new file mode 100644
index 0000000000000000000000000000000000000000..41f397529fe3322a0a2f8f54d2ba1ea87b798af6
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseDeleteError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class DatabaseDeleteError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseListError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseListError.php
new file mode 100644
index 0000000000000000000000000000000000000000..04a7fb9e83590b14e20eca0da1839bf995aa6bc8
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseListError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class DatabaseListError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseNameError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseNameError.php
new file mode 100644
index 0000000000000000000000000000000000000000..17a987a03b0f4389b257d4b1a42072343a118be9
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseNameError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class DatabaseNameError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseUpdateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseUpdateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..c891c1737876ae528965c790b9dd6e3c255c80a5
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DatabaseUpdateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class DatabaseUpdateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DeleteError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DeleteError.php
new file mode 100644
index 0000000000000000000000000000000000000000..27c4b2a4894afabbb5c1f5a3c785930b16b7478a
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DeleteError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class DeleteError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DocumentError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DocumentError.php
new file mode 100644
index 0000000000000000000000000000000000000000..d501e3594b64322e63ae5b638bb4906d8cf0a501
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DocumentError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class DocumentError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DomainError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DomainError.php
new file mode 100644
index 0000000000000000000000000000000000000000..b4eac2ae1d36ed2d9f71824da01947b322dbf325
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/DomainError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class DomainError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/EmptyResponseError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/EmptyResponseError.php
new file mode 100644
index 0000000000000000000000000000000000000000..c7863c09b0196f1fbaea648d6b9410226aa8317a
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/EmptyResponseError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class EmptyResponseError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/EndpointError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/EndpointError.php
new file mode 100644
index 0000000000000000000000000000000000000000..a686a6456e9f17e14557eca7639d40c0ab077be1
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/EndpointError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class EndpointError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/FlavorError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/FlavorError.php
new file mode 100644
index 0000000000000000000000000000000000000000..469dc27e76c45125da75d7f73e50582ab7a6c14b
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/FlavorError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class FlavorError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpError.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b54b8a8253252caf1246845fded967db9167ddb
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class HttpError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpForbiddenError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpForbiddenError.php
new file mode 100644
index 0000000000000000000000000000000000000000..a5c647805169be99aa8e855aa24bd1ed7d2af6f4
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpForbiddenError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class HttpForbiddenError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpOverLimitError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpOverLimitError.php
new file mode 100644
index 0000000000000000000000000000000000000000..243e8df64fd338133c153db06164af365d36449a
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpOverLimitError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class HttpOverLimitError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpRetryError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpRetryError.php
new file mode 100644
index 0000000000000000000000000000000000000000..78345840bba56f27106536064f37c071d8d9a555
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpRetryError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class HttpRetryError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpTimeoutError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpTimeoutError.php
new file mode 100644
index 0000000000000000000000000000000000000000..81bc9dda60893e2d9ca10ed1846e0a4f15868652
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpTimeoutError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class HttpTimeoutError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpUnauthorizedError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpUnauthorizedError.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b1edb203334fb73163f05418b2cb0416dd0bfb7
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpUnauthorizedError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class HttpUnauthorizedError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpUrlError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpUrlError.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa2af82c564449886fa95a20adc7ed7f89aaa96e
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/HttpUrlError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class HttpUrlError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/IOError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/IOError.php
new file mode 100644
index 0000000000000000000000000000000000000000..df816336c6cb33d5c130c078b843f0913dc87286
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/IOError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class IOError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/IdRequiredError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/IdRequiredError.php
new file mode 100644
index 0000000000000000000000000000000000000000..398b9f3fd85c87d9f646f66ac83b41f5f3896251
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/IdRequiredError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class IdRequiredError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ImageError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ImageError.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b846a7551f2213853d11a52a6e2e341bc8a932f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ImageError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ImageError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceCreateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceCreateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..65caa154497c496d21e28940bb93bead60619cfc
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceCreateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InstanceCreateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceDeleteError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceDeleteError.php
new file mode 100644
index 0000000000000000000000000000000000000000..e4c6fdb7f579705021ae468f8f0641c549a52639
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceDeleteError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InstanceDeleteError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceError.php
new file mode 100644
index 0000000000000000000000000000000000000000..48152824862fb9f96a7c902b012db10904e3ff2e
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InstanceError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceFlavorError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceFlavorError.php
new file mode 100644
index 0000000000000000000000000000000000000000..e8a074eb9bfd681808319cf1a58962dfb70f30fc
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceFlavorError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InstanceFlavorError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceNotFound.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceNotFound.php
new file mode 100644
index 0000000000000000000000000000000000000000..4bc94797b3f17f8d48c0991cc5e7668e782cc5dc
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceNotFound.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InstanceNotFound extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceUpdateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceUpdateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..b15f34260130611c7075cdea0f4dd77943bfb6b4
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InstanceUpdateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InstanceUpdateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidArgumentError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidArgumentError.php
new file mode 100644
index 0000000000000000000000000000000000000000..a655f11a7316f8c1fe6453a3186acb3210212bfc
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidArgumentError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InvalidArgumentError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidIdTypeError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidIdTypeError.php
new file mode 100644
index 0000000000000000000000000000000000000000..f329c74895793f5baca3c5d2b2ffabbf099e7c05
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidIdTypeError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InvalidIdTypeError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidIpTypeError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidIpTypeError.php
new file mode 100644
index 0000000000000000000000000000000000000000..370d8f650de8c546425396f8a6b2aab29aa9feb4
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidIpTypeError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InvalidIpTypeError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidParameterError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidParameterError.php
new file mode 100644
index 0000000000000000000000000000000000000000..f13986ffc94dbd0ab5493cca7ac7efb35374ca56
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidParameterError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InvalidParameterError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidRequestError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidRequestError.php
new file mode 100644
index 0000000000000000000000000000000000000000..0266d8f22bdbe245e9412f0379976e8276a89db7
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/InvalidRequestError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class InvalidRequestError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/JsonError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/JsonError.php
new file mode 100644
index 0000000000000000000000000000000000000000..96f9102ed370dcfbd009cd20de6ff1d79dfd0828
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/JsonError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class JsonError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/LoggingException.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/LoggingException.php
new file mode 100644
index 0000000000000000000000000000000000000000..a5bdad705f44704017074c7f890d472e19735cfc
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/LoggingException.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @copyright Copyright 2012-2013 Rackspace US, Inc.
+ See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.5.9
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\Common\Exceptions;
+
+use Exception;
+
+class LoggingException extends Exception
+{
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataCreateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataCreateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..a119397392fb8afb2f16c590cecce442487e46a9
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataCreateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class MetadataCreateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataDeleteError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataDeleteError.php
new file mode 100644
index 0000000000000000000000000000000000000000..4acd879afe9d754f6c16e9f4d2309a29d81a3f61
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataDeleteError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class MetadataDeleteError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataError.php
new file mode 100644
index 0000000000000000000000000000000000000000..65f94975a44705d52bfa0a0e75f0c22877f84527
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class MetadataError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataJsonError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataJsonError.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7a74ca9e1325696aab3b7a02bbcd7934e717435
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataJsonError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class MetadataJsonError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataKeyError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataKeyError.php
new file mode 100644
index 0000000000000000000000000000000000000000..606f6d958742a5e84bc0dbe33127f1dfc85b2dad
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataKeyError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class MetadataKeyError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataPrefixError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataPrefixError.php
new file mode 100644
index 0000000000000000000000000000000000000000..271e69010a70a70ecb649fd87751ab8621272d81
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataPrefixError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class MetadataPrefixError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataUpdateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataUpdateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..49db43d6f70e6d281081abc7ffdfd22015161279
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MetadataUpdateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class MetadataUpdateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MisMatchedChecksumError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MisMatchedChecksumError.php
new file mode 100644
index 0000000000000000000000000000000000000000..75b4f9269956154534a0e33594b6f7b4c71e3baf
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MisMatchedChecksumError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class MisMatchedChecksumError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MissingValueError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MissingValueError.php
new file mode 100644
index 0000000000000000000000000000000000000000..0dd5b8ee737e7da72a22e1346cd07fe19208a484
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/MissingValueError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class MissingValueError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NameError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NameError.php
new file mode 100644
index 0000000000000000000000000000000000000000..6918120a56c81d33e0694e97d94f103ea55684e6
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NameError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class NameError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkCreateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkCreateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..a0c7640ffe894db32a15f187307274368a07cf4b
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkCreateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class NetworkCreateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkDeleteError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkDeleteError.php
new file mode 100644
index 0000000000000000000000000000000000000000..0e2922babe2158d8c000d92d426f8e360b35624f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkDeleteError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class NetworkDeleteError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkError.php
new file mode 100644
index 0000000000000000000000000000000000000000..4b30806c1bcb0be5bbb7180b2cc49a95e92886cf
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class NetworkError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkUpdateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkUpdateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..f55f09d8ec23ca4e7ce57d283986827a940f3001
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkUpdateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class NetworkUpdateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkUrlError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkUrlError.php
new file mode 100644
index 0000000000000000000000000000000000000000..666ec50482b894f1ede4764760cb76cec2b98a1f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NetworkUrlError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class NetworkUrlError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NoContentTypeError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NoContentTypeError.php
new file mode 100644
index 0000000000000000000000000000000000000000..59a3308816332710fa59686ae216a53121278ed8
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NoContentTypeError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class NoContentTypeError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NoNameError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NoNameError.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d56f5fcd0d6b45a9d0ef6489892421247099ae5
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/NoNameError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class NoNameError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ObjFetchError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ObjFetchError.php
new file mode 100644
index 0000000000000000000000000000000000000000..9d7391823e88e105f5c87df974de688319bfe811
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ObjFetchError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ObjFetchError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ObjectCopyError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ObjectCopyError.php
new file mode 100644
index 0000000000000000000000000000000000000000..ef7b3b39220084d726ee05891abbee5a5dca81a8
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ObjectCopyError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ObjectCopyError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ObjectError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ObjectError.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea667ad25f64bea759145ff3bdec374fcf31af4c
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ObjectError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ObjectError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/RebuildError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/RebuildError.php
new file mode 100644
index 0000000000000000000000000000000000000000..9ee6ab37fd985a811c0fe07aa540f112b21aeb90
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/RebuildError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class RebuildError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/RecordTypeError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/RecordTypeError.php
new file mode 100644
index 0000000000000000000000000000000000000000..718ce98574cafd931f7cd33edca4474103e0f416
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/RecordTypeError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class RecordTypeError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerActionError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerActionError.php
new file mode 100644
index 0000000000000000000000000000000000000000..d4ad6453281269f0af6e8864d95a846ab8c3b080
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerActionError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ServerActionError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerCreateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerCreateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..69904111c61f9ca04cd2bc00ab4233758549e01e
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerCreateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ServerCreateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerDeleteError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerDeleteError.php
new file mode 100644
index 0000000000000000000000000000000000000000..94a1adc4f0bdf5e45b32d95717dc58c02a655c1a
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerDeleteError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ServerDeleteError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerImageScheduleError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerImageScheduleError.php
new file mode 100644
index 0000000000000000000000000000000000000000..19fbcbd279cad7ec84d4f1644116b0de2774b3f0
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerImageScheduleError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ServerImageScheduleError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerIpsError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerIpsError.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e737c28614b4ec935e44ca099066c8942629e7f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerIpsError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ServerIpsError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerJsonError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerJsonError.php
new file mode 100644
index 0000000000000000000000000000000000000000..c10e67d645ded1dce01cd1d7caef56d3be971c7f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerJsonError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ServerJsonError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerUpdateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerUpdateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..d9d7b3708080b37a854538343ca1db48016d1a88
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerUpdateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ServerUpdateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerUrlError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerUrlError.php
new file mode 100644
index 0000000000000000000000000000000000000000..ba0308d04e7bd99cc685e093f83fe8f6327e53fc
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServerUrlError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ServerUrlError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServiceValueError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServiceValueError.php
new file mode 100644
index 0000000000000000000000000000000000000000..7ce52c846a48c43fd25756b04d18b7995530d49a
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/ServiceValueError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class ServiceValueError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/SnapshotError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/SnapshotError.php
new file mode 100644
index 0000000000000000000000000000000000000000..14d7614a9ee1e2c59cee8c3056d6aa071593a6a5
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/SnapshotError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class SnapshotError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/TempUrlMethodError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/TempUrlMethodError.php
new file mode 100644
index 0000000000000000000000000000000000000000..61f4647d1b31cab3f9b204e2bb1e4335d9e166c9
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/TempUrlMethodError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class TempUrlMethodError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnknownError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnknownError.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b0772530fc85c0dc7c3095a41d5a70d749be94c
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnknownError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UnknownError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnknownParameterError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnknownParameterError.php
new file mode 100644
index 0000000000000000000000000000000000000000..704ee28c0526dd8acfcc724d7056536767bbca67
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnknownParameterError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UnknownParameterError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnrecognizedServiceError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnrecognizedServiceError.php
new file mode 100644
index 0000000000000000000000000000000000000000..396d451e1317cd71f4612251eae62f28a2248be7
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnrecognizedServiceError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UnrecognizedServiceError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnsupportedExtensionError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnsupportedExtensionError.php
new file mode 100644
index 0000000000000000000000000000000000000000..5ff5ae89c737a3ddd04a613b31db1854e23751ed
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnsupportedExtensionError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UnsupportedExtensionError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnsupportedFeatureExtension.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnsupportedFeatureExtension.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d9143a1d9171fc1c41a0b20c0788dd77a0c7537
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnsupportedFeatureExtension.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UnsupportedFeatureExtension extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnsupportedVersionError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnsupportedVersionError.php
new file mode 100644
index 0000000000000000000000000000000000000000..060733ad5b551c50306bc0c35b26c12e00da58b7
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UnsupportedVersionError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UnsupportedVersionError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UpdateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UpdateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..23f0dbb6aa7f24a275195b514a9b5024038a875e
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UpdateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UpdateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UrlError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UrlError.php
new file mode 100644
index 0000000000000000000000000000000000000000..6c4d9ab69aa7430e74b9d9693a83abce300590e9
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UrlError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UrlError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserCreateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserCreateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..f87ee0d2fc9cef256cd21501c3d60686cf038f55
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserCreateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UserCreateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserDeleteError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserDeleteError.php
new file mode 100644
index 0000000000000000000000000000000000000000..3196289aafc4a135acbf314c834c357431be9f35
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserDeleteError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UserDeleteError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserListError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserListError.php
new file mode 100644
index 0000000000000000000000000000000000000000..7d287ae0ecf26f04f89c65a343da7cda1f910852
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserListError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UserListError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserNameError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserNameError.php
new file mode 100644
index 0000000000000000000000000000000000000000..51902f8e93cd25f2f2fb73505e4f50651e5d52d9
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserNameError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UserNameError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserUpdateError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserUpdateError.php
new file mode 100644
index 0000000000000000000000000000000000000000..403b53420d011093745b2a8b73bf6a1528bbf600
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/UserUpdateError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class UserUpdateError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/VolumeError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/VolumeError.php
new file mode 100644
index 0000000000000000000000000000000000000000..c19c4c2009df39179f8a585c16d5ff15c42f4f8c
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/VolumeError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class VolumeError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/VolumeTypeError.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/VolumeTypeError.php
new file mode 100644
index 0000000000000000000000000000000000000000..a9cc1e3f64ba0152cb291c18d81774ecac9f55b8
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Exceptions/VolumeTypeError.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace OpenCloud\Common\Exceptions;
+
+class VolumeTypeError extends \Exception {}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Identity/Role.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Identity/Role.php
new file mode 100644
index 0000000000000000000000000000000000000000..b2c480d71b5e154bfe959d256c83f94f145ea50b
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Identity/Role.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * PHP OpenCloud library.
+ *
+ * @author Jamie Hannaford <jamie@limetree.org>
+ * @version 2.0.0
+ * @copyright Copyright 2012-2013 Rackspace US, Inc.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ */
+
+/**
+ * Description of Role
+ *
+ * @link
+ *
+ * @codeCoverageIgnore
+ */
+class Role
+{
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Identity/Tenant.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Identity/Tenant.php
new file mode 100644
index 0000000000000000000000000000000000000000..62783613c2fcdfd65396b90f13b6ff9fb83e636d
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Identity/Tenant.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * PHP OpenCloud library.
+ *
+ * @author Jamie Hannaford <jamie@limetree.org>
+ * @version 2.0.0
+ * @copyright Copyright 2012-2013 Rackspace US, Inc.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ */
+
+/**
+ * Description of Tenant
+ *
+ * @link
+ *
+ * @codeCoverageIgnore
+ */
+class Tenant
+{
+
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Identity/User.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Identity/User.php
new file mode 100644
index 0000000000000000000000000000000000000000..9e3862d1750cb09f0b6a81840c8106cb196c85aa
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Identity/User.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright 2012-2013 Rackspace Hosting, Inc.
+ * See COPYING for licensing information
+ * @package phpOpenCloud
+ * @version 1.5.9
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.co.uk>
+ */
+
+/**
+ * Represents a sub-user in Keystone.
+ *
+ * @link http://docs.rackspace.com/auth/api/v2.0/auth-client-devguide/content/User_Calls.html
+ *
+ * @codeCoverageIgnore
+ */
+class User extends PersistentObject
+{
+
+ public static function factory($info)
+ {
+ $user = new self;
+ }
+
+ /**
+ * Return detailed information about a specific user, by either user name or user ID.
+ * @param int|string $info
+ */
+ public function get($info)
+ {
+ if (is_integer($info)) {
+
+ } elseif (is_string($info)) {
+
+ } else {
+ throw new Exception\IdentityException(sprintf(
+ 'A string-based username or an integer-based user ID is valid'
+ ));
+ }
+ }
+
+ public function create()
+ {
+
+ }
+
+ public function update()
+ {
+
+ }
+
+ public function delete()
+ {
+
+ }
+
+ public function listAllCredentials()
+ {
+
+ }
+
+ public function getCredentials()
+ {
+
+ }
+
+ public function resetApiKey()
+ {
+
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Lang.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..7bb12859734b51b7592513b8716ac6760c8f9c6f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Lang.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace OpenCloud\Common;
+
+class Lang
+{
+
+ public static function translate($word = null)
+ {
+ return $word;
+ }
+
+ public static function noslash($str)
+ {
+ while ($str && (substr($str, -1) == '/')) {
+ $str = substr($str, 0, strlen($str) - 1);
+ }
+ return $str;
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/AbstractLogger.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/AbstractLogger.php
new file mode 100644
index 0000000000000000000000000000000000000000..c7aea7f8767ea91ba51ff449480dbbceabe6388b
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/AbstractLogger.php
@@ -0,0 +1,140 @@
+<?php
+
+// Copyright (c) 2012 PHP Framework Interoperability Group
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace OpenCloud\Common\Log;
+
+/**
+ * This is a simple Logger implementation that other Loggers can inherit from.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+abstract class AbstractLogger implements LoggerInterface
+{
+ /**
+ * System is unusable.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function emergency($message, array $context = array())
+ {
+ $this->log(LogLevel::EMERGENCY, $message, $context);
+ }
+
+ /**
+ * Action must be taken immediately.
+ *
+ * Example: Entire website down, database unavailable, etc. This should
+ * trigger the SMS alerts and wake you up.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function alert($message, array $context = array())
+ {
+ $this->log(LogLevel::ALERT, $message, $context);
+ }
+
+ /**
+ * Critical conditions.
+ *
+ * Example: Application component unavailable, unexpected exception.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function critical($message, array $context = array())
+ {
+ $this->log(LogLevel::CRITICAL, $message, $context);
+ }
+
+ /**
+ * Runtime errors that do not require immediate action but should typically
+ * be logged and monitored.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function error($message, array $context = array())
+ {
+ $this->log(LogLevel::ERROR, $message, $context);
+ }
+
+ /**
+ * Exceptional occurrences that are not errors.
+ *
+ * Example: Use of deprecated APIs, poor use of an API, undesirable things
+ * that are not necessarily wrong.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function warning($message, array $context = array())
+ {
+ $this->log(LogLevel::WARNING, $message, $context);
+ }
+
+ /**
+ * Normal but significant events.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function notice($message, array $context = array())
+ {
+ $this->log(LogLevel::NOTICE, $message, $context);
+ }
+
+ /**
+ * Interesting events.
+ *
+ * Example: User logs in, SQL logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function info($message, array $context = array())
+ {
+ $this->log(LogLevel::INFO, $message, $context);
+ }
+
+ /**
+ * Detailed debug information.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function debug($message, array $context = array())
+ {
+ $this->log(LogLevel::DEBUG, $message, $context);
+ }
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/LogLevel.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/LogLevel.php
new file mode 100644
index 0000000000000000000000000000000000000000..64b0169b5078d2e2628e106e6caf03e1c08e42a8
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/LogLevel.php
@@ -0,0 +1,38 @@
+<?php
+
+// Copyright (c) 2012 PHP Framework Interoperability Group
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace OpenCloud\Common\Log;
+
+/**
+ * Describes log levels
+ */
+class LogLevel
+{
+ const EMERGENCY = 'emergency';
+ const ALERT = 'alert';
+ const CRITICAL = 'critical';
+ const ERROR = 'error';
+ const WARNING = 'warning';
+ const NOTICE = 'notice';
+ const INFO = 'info';
+ const DEBUG = 'debug';
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/Logger.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/Logger.php
new file mode 100644
index 0000000000000000000000000000000000000000..e11d3fbb7caca9ce76c30d7f08748b16e74cd7a3
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/Logger.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * @copyright Copyright 2012-2013 Rackspace US, Inc.
+ See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.5.9
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\Common\Log;
+
+use OpenCloud\Common\Exceptions\LoggingException;
+
+/**
+ * Basic logger for OpenCloud which extends FIG's PSR-3 standard logger.
+ *
+ * @link https://github.com/php-fig/log
+ */
+class Logger extends AbstractLogger
+{
+ /**
+ * Is this debug class enabled or not?
+ *
+ * @var bool
+ */
+ private $enabled = false;
+
+ /**
+ * These are the levels which will always be outputted - regardless of
+ * user-imposed settings.
+ *
+ * @var array
+ */
+ private $urgentLevels = array(
+ LogLevel::EMERGENCY,
+ LogLevel::ALERT,
+ LogLevel::CRITICAL
+ );
+
+ /**
+ * Logging options.
+ *
+ * @var array
+ */
+ private $options = array(
+ 'outputToFile' => false,
+ 'logFile' => null,
+ 'dateFormat' => 'd/m/y H:I',
+ 'delimeter' => ' - '
+ );
+
+ /**
+ * Determines whether a log level needs to be outputted.
+ *
+ * @param string $logLevel
+ * @return bool
+ */
+ private function outputIsUrgent($logLevel)
+ {
+ return in_array($logLevel, $this->urgentLevels);
+ }
+
+ /**
+ * Interpolates context values into the message placeholders.
+ *
+ * @param string $message
+ * @param array $context
+ * @return type
+ */
+ private function interpolate($message, array $context = array())
+ {
+ // build a replacement array with braces around the context keys
+ $replace = array();
+ foreach ($context as $key => $val) {
+ $replace['{' . $key . '}'] = $val;
+ }
+
+ // interpolate replacement values into the message and return
+ return strtr($message, $replace);
+ }
+
+ /**
+ * Enable or disable the debug class.
+ *
+ * @param bool $enabled
+ * @return self
+ */
+ public function setEnabled($enabled)
+ {
+ $this->enabled = $enabled;
+ return $this;
+ }
+
+ /**
+ * Is the debug class enabled?
+ *
+ * @return bool
+ */
+ public function getEnabled()
+ {
+ return $this->enabled;
+ }
+
+ /**
+ * Set an array of options.
+ *
+ * @param array $options
+ */
+ public function setOptions(array $options = array())
+ {
+ foreach ($options as $key => $value) {
+ $this->setOption($key, $value);
+ }
+ }
+
+ /**
+ * Get all options.
+ *
+ * @return array
+ */
+ public function getOptions()
+ {
+ return $this->options;
+ }
+
+ /**
+ * Set an individual option.
+ *
+ * @param string $key
+ * @param string $value
+ */
+ public function setOption($key, $value)
+ {
+ if ($this->optionExists($key)) {
+ $this->options[$key] = $value;
+ }
+ }
+
+ /**
+ * Get an individual option.
+ *
+ * @param string $key
+ * @return string|null
+ */
+ public function getOption($key)
+ {
+ if ($this->optionExists($key)) {
+ return $this->options[$key];
+ }
+ }
+
+ /**
+ * Check whether an individual option exists.
+ *
+ * @param string $key
+ * @return bool
+ */
+ private function optionExists($key)
+ {
+ return array_key_exists($key, $this->getOptions());
+ }
+
+ /**
+ * Outputs a log message if necessary.
+ *
+ * @param string $logLevel
+ * @param string $message
+ * @param string $context
+ */
+ public function log($level, $message, array $context = array())
+ {
+ if ($this->outputIsUrgent($level)
+ || $this->getEnabled() === true
+ || RAXSDK_DEBUG === true
+ ) {
+ $this->dispatch($message, $context);
+ }
+ }
+
+ /**
+ * Used to format the line outputted in the log file.
+ *
+ * @param string $string
+ * @return string
+ */
+ private function formatFileLine($string)
+ {
+ $format = $this->getOption('dateFormat') . $this->getOption('delimeter');
+ return date($format) . $string;
+ }
+
+ /**
+ * Dispatch a log output message.
+ *
+ * @param string $message
+ * @param array $context
+ * @throws LoggingException
+ */
+ private function dispatch($message, $context)
+ {
+ $output = $this->interpolate($message, $context) . PHP_EOL;
+
+ if ($this->getOption('outputToFile') === true) {
+ $file = $this->getOption('logFile');
+
+ if (!is_writable($file)) {
+ throw new LoggingException(
+ 'The log file either does not exist or is not writeable'
+ );
+ }
+
+ // Output to file
+ file_put_contents($file, $this->formatFileLine($output));
+ } else {
+
+ echo $output;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/LoggerInterface.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/LoggerInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..daef1b04dad6f46bec93cdd0f87cdd207417c2a4
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/LoggerInterface.php
@@ -0,0 +1,134 @@
+<?php
+
+// Copyright (c) 2012 PHP Framework Interoperability Group
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace OpenCloud\Common\Log;
+
+/**
+ * Describes a logger instance
+ *
+ * The message MUST be a string or object implementing __toString().
+ *
+ * The message MAY contain placeholders in the form: {foo} where foo
+ * will be replaced by the context data in key "foo".
+ *
+ * The context array can contain arbitrary data, the only assumption that
+ * can be made by implementors is that if an Exception instance is given
+ * to produce a stack trace, it MUST be in a key named "exception".
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ * for the full interface specification.
+ */
+interface LoggerInterface
+{
+ /**
+ * System is unusable.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function emergency($message, array $context = array());
+
+ /**
+ * Action must be taken immediately.
+ *
+ * Example: Entire website down, database unavailable, etc. This should
+ * trigger the SMS alerts and wake you up.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function alert($message, array $context = array());
+
+ /**
+ * Critical conditions.
+ *
+ * Example: Application component unavailable, unexpected exception.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function critical($message, array $context = array());
+
+ /**
+ * Runtime errors that do not require immediate action but should typically
+ * be logged and monitored.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function error($message, array $context = array());
+
+ /**
+ * Exceptional occurrences that are not errors.
+ *
+ * Example: Use of deprecated APIs, poor use of an API, undesirable things
+ * that are not necessarily wrong.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function warning($message, array $context = array());
+
+ /**
+ * Normal but significant events.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function notice($message, array $context = array());
+
+ /**
+ * Interesting events.
+ *
+ * Example: User logs in, SQL logs.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function info($message, array $context = array());
+
+ /**
+ * Detailed debug information.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function debug($message, array $context = array());
+
+ /**
+ * Logs with an arbitrary level.
+ *
+ * @param mixed $level
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ public function log($level, $message, array $context = array());
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Metadata.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Metadata.php
new file mode 100644
index 0000000000000000000000000000000000000000..be6903e897ed8560e0a1fe2db9738573e28acb8f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Metadata.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * A metadata object, used by other components in Compute and Object Storage
+ *
+ * @copyright 2012-2013 Rackspace Hosting, Inc.
+ * See COPYING for licensing information
+ *
+ * @package phpOpenCloud
+ * @version 1.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ */
+
+namespace OpenCloud\Common;
+
+/**
+ * The Metadata class represents either Server or Image metadata
+ *
+ * @api
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ */
+class Metadata extends Base
+{
+
+ // array holding the names of keys that were set
+ private $_keylist = array();
+
+ /**
+ * This setter overrides the base one, since the metadata key can be
+ * anything
+ *
+ * @param string $key
+ * @param string $value
+ * @return void
+ */
+ public function __set($key, $value)
+ {
+ // set the value and track the keys
+ if (!in_array($key, $this->_keylist)) {
+ $this->_keylist[] = $key;
+ }
+
+ $this->$key = $value;
+ }
+
+ /**
+ * Returns the list of keys defined
+ *
+ * @return array
+ */
+ public function Keylist()
+ {
+ return $this->_keylist;
+ }
+
+ /**
+ * Sets metadata values from an array, with optional prefix
+ *
+ * If $prefix is provided, then only array keys that match the prefix
+ * are set as metadata values, and $prefix is stripped from the key name.
+ *
+ * @param array $values an array of key/value pairs to set
+ * @param string $prefix if provided, a prefix that is used to identify
+ * metadata values. For example, you can set values from headers
+ * for a Container by using $prefix='X-Container-Meta-'.
+ * @return void
+ */
+ public function setArray($values, $prefix = null)
+ {
+ if (empty($values)) {
+ return false;
+ }
+
+ foreach ($values as $key => $value) {
+ if ($prefix) {
+ if (strpos($key, $prefix) === 0) {
+ $name = substr($key, strlen($prefix));
+ $this->getLogger()->info(
+ Lang::translate('Setting [{name}] to [{value}]'),
+ array(
+ 'name' => $name,
+ 'value' => $value
+ )
+ );
+ $this->$name = $value;
+ }
+ } else {
+ $this->$key = $value;
+ }
+ }
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Nova.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Nova.php
new file mode 100644
index 0000000000000000000000000000000000000000..fe4dcccc73f8f74fe81c2c74bbecf998ee0cf213
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Nova.php
@@ -0,0 +1,140 @@
+<?php
+
+/**
+ * An abstract class that defines shared components for products that use
+ * OpenStack Nova
+ *
+ * @copyright 2012-2013 Rackspace Hosting, Inc.
+ * See COPYING for licensing information
+ *
+ * @package phpOpenCloud
+ * @version 1.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ */
+
+namespace OpenCloud\Common;
+
+use OpenCloud\OpenStack;
+use OpenCloud\Common\Lang;
+use OpenCloud\Compute\Flavor;
+
+/**
+ * Nova is an abstraction layer for the OpenStack compute service.
+ *
+ * Nova is used as a basis for several products, including Compute services
+ * as well as Rackspace's Cloud Databases. This class is, in essence, a vehicle
+ * for sharing common code between those other classes.
+ */
+abstract class Nova extends Service
+{
+
+ private $_url;
+
+ /**
+ * Called when creating a new Compute service object
+ *
+ * _NOTE_ that the order of parameters for this is *different* from the
+ * parent Service class. This is because the earlier parameters are the
+ * ones that most typically change, whereas the later ones are not
+ * modified as often.
+ *
+ * @param \OpenCloud\Identity $conn - a connection object
+ * @param string $serviceRegion - identifies the region of this Compute
+ * service
+ * @param string $urltype - identifies the URL type ("publicURL",
+ * "privateURL")
+ * @param string $serviceName - identifies the name of the service in the
+ * catalog
+ */
+ public function __construct(
+ OpenStack $conn,
+ $serviceType,
+ $serviceName,
+ $serviceRegion,
+ $urltype
+ ) {
+ parent::__construct(
+ $conn,
+ $serviceType,
+ $serviceName,
+ $serviceRegion,
+ $urltype
+ );
+
+ $this->_url = Lang::noslash(parent::Url());
+
+ $this->getLogger()->info(Lang::translate('Initializing Nova...'));
+ }
+
+ /**
+ * Returns a flavor from the service
+ *
+ * This is a factory method and should generally be called instead of
+ * creating a Flavor object directly.
+ *
+ * @api
+ * @param string $id - if supplied, the Flavor identified by this is
+ * retrieved
+ * @return Compute\Flavor object
+ */
+ public function Flavor($id = null)
+ {
+ return new Flavor($this, $id);
+ }
+
+ /**
+ * Returns a list of Flavor objects
+ *
+ * This is a factory method and should generally be called instead of
+ * creating a FlavorList object directly.
+ *
+ * @api
+ * @param boolean $details - if TRUE (the default), returns full details.
+ * Set to FALSE to retrieve minimal details and possibly improve
+ * performance.
+ * @param array $filter - optional key/value pairs for creating query
+ * strings
+ * @return Collection (or FALSE on an error)
+ */
+ public function FlavorList($details = true, array $filter = array())
+ {
+ if ($details) {
+ $url = $this->Url(Flavor::ResourceName().'/detail', $filter);
+ } else {
+ $url = $this->Url(Flavor::ResourceName(), $filter);
+ }
+ return $this->Collection('\OpenCloud\Compute\Flavor', $url);
+ }
+
+ /**
+ * Gets a request from an HTTP source and ensures that the
+ * content type is always "application/json"
+ *
+ * This is a simple subclass of the parent::Request() method that ensures
+ * that all Compute requests use application/json as the Content-Type:
+ *
+ * @param string $url - the URL of the request
+ * @param string $method - the HTTP method ("GET" by default)
+ * @param array $headers - an associative array of headers to pass to
+ * the request
+ * @param string $body - optional body for POST or PUT requests
+ * @return \Rackspace\HttpResult object
+ */
+ public function Request($url, $method = 'GET', array $headers = array(), $body = null)
+ {
+ $headers['Content-Type'] = RAXSDK_CONTENT_TYPE_JSON;
+ return parent::Request($url, $method, $headers, $body);
+ }
+
+ /**
+ * Loads the available namespaces from the /extensions resource
+ */
+ protected function load_namespaces()
+ {
+ $ext = $this->Extensions();
+ foreach($ext as $obj) {
+ $this->_namespaces[] = $obj->alias;
+ }
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/PersistentObject.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/PersistentObject.php
new file mode 100644
index 0000000000000000000000000000000000000000..0257526d709c0970eb65df04c3226ef6a03306c8
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/PersistentObject.php
@@ -0,0 +1,939 @@
+<?php
+/**
+ * An abstraction that defines persistent objects associated with a service
+ *
+ * @copyright 2012-2013 Rackspace Hosting, Inc.
+ * See COPYING for licensing information
+ *
+ * @package phpOpenCloud
+ * @version 1.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\Common;
+
+/**
+ * Represents an object that can be retrieved, created, updated and deleted.
+ *
+ * This class abstracts much of the common functionality between:
+ *
+ * * Nova servers;
+ * * Swift containers and objects;
+ * * DBAAS instances;
+ * * Cinder volumes;
+ * * and various other objects that:
+ * * have a URL;
+ * * can be created, updated, deleted, or retrieved;
+ * * use a standard JSON format with a top-level element followed by
+ * a child object with attributes.
+ *
+ * In general, you can create a persistent object class by subclassing this
+ * class and defining some protected, static variables:
+ *
+ * * $url_resource - the sub-resource value in the URL of the parent. For
+ * example, if the parent URL is `http://something/parent`, then setting this
+ * value to "another" would result in a URL for the persistent object of
+ * `http://something/parent/another`.
+ *
+ * * $json_name - the top-level JSON object name. For example, if the
+ * persistent object is represented by `{"foo": {"attr":value, ...}}`, then
+ * set $json_name to "foo".
+ *
+ * * $json_collection_name - optional; this value is the name of a collection
+ * of the persistent objects. If not provided, it defaults to `json_name`
+ * with an appended "s" (e.g., if `json_name` is "foo", then
+ * `json_collection_name` would be "foos"). Set this value if the collection
+ * name doesn't follow this pattern.
+ *
+ * * $json_collection_element - the common pattern for a collection is:
+ * `{"collection": [{"attr":"value",...}, {"attr":"value",...}, ...]}`
+ * That is, each element of the array is a \stdClass object containing the
+ * object's attributes. In rare instances, the objects in the array
+ * are named, and `json_collection_element` contains the name of the
+ * collection objects. For example, in this JSON response:
+ * `{"allowedDomain":[{"allowedDomain":{"name":"foo"}}]}`,
+ * `json_collection_element` would be set to "allowedDomain".
+ *
+ * The PersistentObject class supports the standard CRUD methods; if these are
+ * not needed (i.e. not supported by the service), the subclass should redefine
+ * these to call the `noCreate`, `noUpdate`, or `noDelete` methods, which will
+ * trigger an appropriate exception. For example, if an object cannot be created:
+ *
+ * function create($params = array())
+ * {
+ * $this->noCreate();
+ * }
+ */
+abstract class PersistentObject extends Base
+{
+
+ private $service;
+
+ private $parent;
+
+ protected $id;
+
+ /**
+ * Retrieves the instance from persistent storage
+ *
+ * @param mixed $service The service object for this resource
+ * @param mixed $info The ID or array/object of data
+ */
+ public function __construct($service = null, $info = null)
+ {
+ if ($service instanceof Service) {
+ $this->setService($service);
+ }
+
+ if (property_exists($this, 'metadata')) {
+ $this->metadata = new Metadata;
+ }
+
+ $this->populate($info);
+ }
+
+ /**
+ * Validates properties that have a namespace: prefix
+ *
+ * If the property prefix: appears in the list of supported extension
+ * namespaces, then the property is applied to the object. Otherwise,
+ * an exception is thrown.
+ *
+ * @param string $name the name of the property
+ * @param mixed $value the property's value
+ * @return void
+ * @throws AttributeError
+ */
+ public function __set($name, $value)
+ {
+ $this->setProperty($name, $value, $this->getService()->namespaces());
+ }
+
+ /**
+ * Sets the service associated with this resource object.
+ *
+ * @param \OpenCloud\Common\Service $service
+ */
+ public function setService(Service $service)
+ {
+ $this->service = $service;
+ return $this;
+ }
+
+ /**
+ * Returns the service object for this resource; required for making
+ * requests, etc. because it has direct access to the Connection.
+ *
+ * @return \OpenCloud\Common\Service
+ */
+ public function getService()
+ {
+ if (null === $this->service) {
+ throw new Exceptions\ServiceValueError(
+ 'No service defined'
+ );
+ }
+ return $this->service;
+ }
+
+ /**
+ * Legacy shortcut to getService
+ *
+ * @return \OpenCloud\Common\Service
+ */
+ public function service()
+ {
+ return $this->getService();
+ }
+
+ /**
+ * Set the parent object for this resource.
+ *
+ * @param \OpenCloud\Common\PersistentObject $parent
+ */
+ public function setParent(PersistentObject $parent)
+ {
+ $this->parent = $parent;
+ return $this;
+ }
+
+ /**
+ * Returns the parent.
+ *
+ * @return \OpenCloud\Common\PersistentObject
+ */
+ public function getParent()
+ {
+ if (null === $this->parent) {
+ $this->parent = $this->getService();
+ }
+ return $this->parent;
+ }
+
+ /**
+ * Legacy shortcut to getParent
+ *
+ * @return \OpenCloud\Common\PersistentObject
+ */
+ public function parent()
+ {
+ return $this->getParent();
+ }
+
+
+
+
+ /**
+ * API OPERATIONS (CRUD & CUSTOM)
+ */
+
+ /**
+ * Creates a new object
+ *
+ * @api
+ * @param array $params array of values to set when creating the object
+ * @return HttpResponse
+ * @throws VolumeCreateError if HTTP status is not Success
+ */
+ public function create($params = array())
+ {
+ // set parameters
+ if (!empty($params)) {
+ $this->populate($params, false);
+ }
+
+ // debug
+ $this->getLogger()->info('{class}::Create({name})', array(
+ 'class' => get_class($this),
+ 'name' => $this->Name()
+ ));
+
+ // construct the JSON
+ $object = $this->createJson();
+ $json = json_encode($object);
+ $this->checkJsonError();
+
+ $this->getLogger()->info('{class}::Create JSON [{json}]', array(
+ 'class' => get_class($this),
+ 'json' => $json
+ ));
+
+ // send the request
+ $response = $this->getService()->request(
+ $this->createUrl(),
+ 'POST',
+ array('Content-Type' => 'application/json'),
+ $json
+ );
+
+ // check the return code
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() > 204) {
+ throw new Exceptions\CreateError(sprintf(
+ Lang::translate('Error creating [%s] [%s], status [%d] response [%s]'),
+ get_class($this),
+ $this->Name(),
+ $response->HttpStatus(),
+ $response->HttpBody()
+ ));
+ }
+
+ if ($response->HttpStatus() == "201" && ($location = $response->Header('Location'))) {
+ // follow Location header
+ $this->refresh(null, $location);
+ } else {
+ // set values from response
+ $object = json_decode($response->httpBody());
+
+ if (!$this->checkJsonError()) {
+ $top = $this->jsonName();
+ if (isset($object->$top)) {
+ $this->populate($object->$top);
+ }
+ }
+ }
+ // @codeCoverageIgnoreEnd
+
+ return $response;
+ }
+
+ /**
+ * Updates an existing object
+ *
+ * @api
+ * @param array $params array of values to set when updating the object
+ * @return HttpResponse
+ * @throws VolumeCreateError if HTTP status is not Success
+ */
+ public function update($params = array())
+ {
+ // set parameters
+ if (!empty($params)) {
+ $this->populate($params);
+ }
+
+ // debug
+ $this->getLogger()->info('{class}::Update({name})', array(
+ 'class' => get_class($this),
+ 'name' => $this->Name()
+ ));
+
+ // construct the JSON
+ $obj = $this->updateJson($params);
+ $json = json_encode($obj);
+
+ $this->checkJsonError();
+
+ $this->getLogger()->info('{class}::Update JSON [{json}]', array(
+ 'class' => get_class($this),
+ 'json' => $json
+ ));
+
+ // send the request
+ $response = $this->getService()->Request(
+ $this->url(),
+ 'PUT',
+ array(),
+ $json
+ );
+
+ // check the return code
+ // @codeCoverageIgnoreStart
+ if ($response->HttpStatus() > 204) {
+ throw new Exceptions\UpdateError(sprintf(
+ Lang::translate('Error updating [%s] with [%s], status [%d] response [%s]'),
+ get_class($this),
+ $json,
+ $response->HttpStatus(),
+ $response->HttpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return $response;
+ }
+
+ /**
+ * Deletes an object
+ *
+ * @api
+ * @return HttpResponse
+ * @throws DeleteError if HTTP status is not Success
+ */
+ public function delete()
+ {
+ $this->getLogger()->info('{class}::Delete()', array('class' => get_class($this)));
+
+ // send the request
+ $response = $this->getService()->request($this->url(), 'DELETE');
+
+ // check the return code
+ // @codeCoverageIgnoreStart
+ if ($response->HttpStatus() > 204) {
+ throw new Exceptions\DeleteError(sprintf(
+ Lang::translate('Error deleting [%s] [%s], status [%d] response [%s]'),
+ get_class(),
+ $this->Name(),
+ $response->HttpStatus(),
+ $response->HttpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return $response;
+ }
+
+ /**
+ * Returns an object for the Create() method JSON
+ * Must be overridden in a child class.
+ *
+ * @throws CreateError if not overridden
+ */
+ protected function createJson()
+ {
+ throw new Exceptions\CreateError(sprintf(
+ Lang::translate('[%s] CreateJson() must be overridden'),
+ get_class($this)
+ ));
+ }
+
+ /**
+ * Returns an object for the Update() method JSON
+ * Must be overridden in a child class.
+ *
+ * @throws UpdateError if not overridden
+ */
+ protected function updateJson($params = array())
+ {
+ throw new Exceptions\UpdateError(sprintf(
+ Lang::translate('[%s] UpdateJson() must be overridden'),
+ get_class($this)
+ ));
+ }
+
+ /**
+ * throws a CreateError for subclasses that don't support Create
+ *
+ * @throws CreateError
+ */
+ protected function noCreate()
+ {
+ throw new Exceptions\CreateError(sprintf(
+ Lang::translate('[%s] does not support Create()'),
+ get_class()
+ ));
+ }
+
+ /**
+ * throws a DeleteError for subclasses that don't support Delete
+ *
+ * @throws DeleteError
+ */
+ protected function noDelete()
+ {
+ throw new Exceptions\DeleteError(sprintf(
+ Lang::translate('[%s] does not support Delete()'),
+ get_class()
+ ));
+ }
+
+ /**
+ * throws a UpdateError for subclasses that don't support Update
+ *
+ * @throws UpdateError
+ */
+ protected function noUpdate()
+ {
+ throw new Exceptions\UpdateError(sprintf(
+ Lang::translate('[%s] does not support Update()'),
+ get_class()
+ ));
+ }
+
+ /**
+ * Returns the default URL of the object
+ *
+ * This may have to be overridden in subclasses.
+ *
+ * @param string $subresource optional sub-resource string
+ * @param array $qstr optional k/v pairs for query strings
+ * @return string
+ * @throws UrlError if URL is not defined
+ */
+ public function url($subresource = null, $queryString = array())
+ {
+ // find the primary key attribute name
+ $primaryKey = $this->primaryKeyField();
+
+ // first, see if we have a [self] link
+ $url = $this->findLink('self');
+
+ /**
+ * Next, check to see if we have an ID
+ * Note that we use Parent() instead of Service(), since the parent
+ * object might not be a service.
+ */
+ if (!$url && $this->$primaryKey) {
+ $url = Lang::noslash($this->getParent()->url($this->resourceName())) . '/' . $this->$primaryKey;
+ }
+
+ // add the subresource
+ if ($url) {
+ $url .= $subresource ? "/$subresource" : '';
+ if (count($queryString)) {
+ $url .= '?' . $this->makeQueryString($queryString);
+ }
+ return $url;
+ }
+
+ // otherwise, we don't have a URL yet
+ throw new Exceptions\UrlError(sprintf(
+ Lang::translate('%s does not have a URL yet'),
+ get_class($this)
+ ));
+ }
+
+ /**
+ * Waits for the server/instance status to change
+ *
+ * This function repeatedly polls the system for a change in server
+ * status. Once the status reaches the `$terminal` value (or 'ERROR'),
+ * then the function returns.
+ *
+ * The polling interval is set by the constant RAXSDK_POLL_INTERVAL.
+ *
+ * The function will automatically terminate after RAXSDK_SERVER_MAXTIMEOUT
+ * seconds elapse.
+ *
+ * @api
+ * @param string $terminal the terminal state to wait for
+ * @param integer $timeout the max time (in seconds) to wait
+ * @param callable $callback a callback function that is invoked with
+ * each repetition of the polling sequence. This can be used, for
+ * example, to update a status display or to permit other operations
+ * to continue
+ * @return void
+ */
+ public function waitFor(
+ $terminal = 'ACTIVE',
+ $timeout = RAXSDK_SERVER_MAXTIMEOUT,
+ $callback = NULL,
+ $sleep = RAXSDK_POLL_INTERVAL
+ ) {
+ // find the primary key field
+ $primaryKey = $this->PrimaryKeyField();
+
+ // save stats
+ $startTime = time();
+
+ $states = array('ERROR', $terminal);
+
+ while (true) {
+
+ $this->refresh($this->$primaryKey);
+
+ if ($callback) {
+ call_user_func($callback, $this);
+ }
+
+ if (in_array($this->status(), $states) || (time() - $startTime) > $timeout) {
+ return;
+ }
+ // @codeCoverageIgnoreStart
+ sleep($sleep);
+ }
+ }
+ // @codeCoverageIgnoreEnd
+
+ /**
+ * Refreshes the object from the origin (useful when the server is
+ * changing states)
+ *
+ * @return void
+ * @throws IdRequiredError
+ */
+ public function refresh($id = null, $url = null)
+ {
+ $primaryKey = $this->PrimaryKeyField();
+
+ if (!$url) {
+ if ($id === null) {
+ $id = $this->$primaryKey;
+ }
+
+ if (!$id) {
+ throw new Exceptions\IdRequiredError(sprintf(
+ Lang::translate('%s has no ID; cannot be refreshed'),
+ get_class())
+ );
+ }
+
+ // retrieve it
+ $this->getLogger()->info(Lang::translate('{class} id [{id}]'), array(
+ 'class' => get_class($this),
+ 'id' => $id
+ ));
+
+ $this->$primaryKey = $id;
+ $url = $this->url();
+ }
+
+ // reset status, if available
+ if (property_exists($this, 'status')) {
+ $this->status = null;
+ }
+
+ // perform a GET on the URL
+ $response = $this->getService()->Request($url);
+
+ // check status codes
+ // @codeCoverageIgnoreStart
+ if ($response->HttpStatus() == 404) {
+ throw new Exceptions\InstanceNotFound(
+ sprintf(Lang::translate('%s [%s] not found [%s]'),
+ get_class($this),
+ $this->$primaryKey,
+ $url
+ ));
+ }
+
+ if ($response->HttpStatus() >= 300) {
+ throw new Exceptions\UnknownError(
+ sprintf(Lang::translate('Unexpected %s error [%d] [%s]'),
+ get_class($this),
+ $response->HttpStatus(),
+ $response->HttpBody()
+ ));
+ }
+
+ // check for empty response
+ if (!$response->HttpBody()) {
+ throw new Exceptions\EmptyResponseError(
+ sprintf(Lang::translate('%s::Refresh() unexpected empty response, URL [%s]'),
+ get_class($this),
+ $url
+ ));
+ }
+
+ // we're ok, reload the response
+ if ($json = $response->HttpBody()) {
+
+ $this->getLogger()->info('refresh() JSON [{json}]', array('json' => $json));
+
+ $response = json_decode($json);
+
+ if ($this->CheckJsonError()) {
+ throw new Exceptions\ServerJsonError(sprintf(
+ Lang::translate('JSON parse error on %s refresh'),
+ get_class($this)
+ ));
+ }
+
+ $top = $this->JsonName();
+
+ if ($top && isset($response->$top)) {
+ $content = $response->$top;
+ } else {
+ $content = $response;
+ }
+
+ $this->populate($content);
+
+ }
+ // @codeCoverageIgnoreEnd
+ }
+
+
+ /**
+ * OBJECT INFORMATION
+ */
+
+ /**
+ * Returns the displayable name of the object
+ *
+ * Can be overridden by child objects; *must* be overridden by child
+ * objects if the object does not have a `name` attribute defined.
+ *
+ * @api
+ * @return string
+ * @throws NameError if attribute 'name' is not defined
+ */
+ public function name()
+ {
+ if (property_exists($this, 'name')) {
+ return $this->name;
+ } else {
+ throw new Exceptions\NameError(sprintf(
+ Lang::translate('Name attribute does not exist for [%s]'),
+ get_class($this)
+ ));
+ }
+ }
+
+ /**
+ * Sends the json string to the /action resource
+ *
+ * This is used for many purposes, such as rebooting the server,
+ * setting the root password, creating images, etc.
+ * Since it can only be used on a live server, it checks for a valid ID.
+ *
+ * @param $object - this will be encoded as json, and we handle all the JSON
+ * error-checking in one place
+ * @throws ServerIdError if server ID is not defined
+ * @throws ServerActionError on other errors
+ * @returns boolean; TRUE if successful, FALSE otherwise
+ */
+ protected function action($object)
+ {
+ $primaryKey = $this->primaryKeyField();
+
+ if (!$this->$primaryKey) {
+ throw new Exceptions\IdRequiredError(sprintf(
+ Lang::translate('%s is not defined'),
+ get_class($this)
+ ));
+ }
+
+ if (!is_object($object)) {
+ throw new Exceptions\ServerActionError(sprintf(
+ Lang::translate('%s::Action() requires an object as its parameter'),
+ get_class($this)
+ ));
+ }
+
+ // convert the object to json
+ $json = json_encode($object);
+ $this->getLogger()->info('JSON [{string}]', array('json' => $json));
+
+ $this->checkJsonError();
+
+ // debug - save the request
+ $this->getLogger()->info(Lang::translate('{class}::action [{json}]'), array(
+ 'class' => get_class($this),
+ 'json' => $json
+ ));
+
+ // get the URL for the POST message
+ $url = $this->url('action');
+
+ // POST the message
+ $response = $this->getService()->request($url, 'POST', array(), $json);
+
+ // @codeCoverageIgnoreStart
+ if (!is_object($response)) {
+ throw new Exceptions\HttpError(sprintf(
+ Lang::translate('Invalid response for %s::Action() request'),
+ get_class($this)
+ ));
+ }
+
+ // check for errors
+ if ($response->HttpStatus() >= 300) {
+ throw new Exceptions\ServerActionError(sprintf(
+ Lang::translate('%s::Action() [%s] failed; response [%s]'),
+ get_class($this),
+ $url,
+ $response->HttpBody()
+ ));
+ }
+ // @codeCoverageIgnoreStart
+
+ return $response;
+ }
+
+ /**
+ * Execute a custom resource request.
+ *
+ * @param string $path
+ * @param string $method
+ * @param string|array|object $body
+ * @return boolean
+ * @throws Exceptions\InvalidArgumentError
+ * @throws Exceptions\HttpError
+ * @throws Exceptions\ServerActionError
+ */
+ public function customAction($url, $method = 'GET', $body = null)
+ {
+ if (is_string($body) && (json_decode($body) === null)) {
+ throw new Exceptions\InvalidArgumentError(
+ 'Please provide either a well-formed JSON string, or an object '
+ . 'for JSON serialization'
+ );
+ } else {
+ $body = json_encode($body);
+ }
+
+ // POST the message
+ $response = $this->service()->request($url, $method, array(), $body);
+
+ if (!is_object($response)) {
+ throw new Exceptions\HttpError(sprintf(
+ Lang::translate('Invalid response for %s::customAction() request'),
+ get_class($this)
+ ));
+ }
+
+ // check for errors
+ // @codeCoverageIgnoreStart
+ if ($response->HttpStatus() >= 300) {
+ throw new Exceptions\ServerActionError(sprintf(
+ Lang::translate('%s::customAction() [%s] failed; response [%s]'),
+ get_class($this),
+ $url,
+ $response->HttpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ $object = json_decode($response->httpBody());
+
+ $this->checkJsonError();
+
+ return $object;
+ }
+
+ /**
+ * returns the object's status or `N/A` if not available
+ *
+ * @api
+ * @return string
+ */
+ public function status()
+ {
+ return (isset($this->status)) ? $this->status : 'N/A';
+ }
+
+ /**
+ * returns the object's identifier
+ *
+ * Can be overridden by a child class if the identifier is not in the
+ * `$id` property. Use of this function permits the `$id` attribute to
+ * be protected or private to prevent unauthorized overwriting for
+ * security.
+ *
+ * @api
+ * @return string
+ */
+ public function id()
+ {
+ return $this->id;
+ }
+
+ /**
+ * checks for `$alias` in extensions and throws an error if not present
+ *
+ * @throws UnsupportedExtensionError
+ */
+ public function checkExtension($alias)
+ {
+ if (!in_array($alias, $this->getService()->namespaces())) {
+ throw new Exceptions\UnsupportedExtensionError(sprintf(
+ Lang::translate('Extension [%s] is not installed'),
+ $alias
+ ));
+ }
+
+ return true;
+ }
+
+ /**
+ * returns the region associated with the object
+ *
+ * navigates to the parent service to determine the region.
+ *
+ * @api
+ */
+ public function region()
+ {
+ return $this->getService()->Region();
+ }
+
+ /**
+ * Since each server can have multiple links, this returns the desired one
+ *
+ * @param string $type - 'self' is most common; use 'bookmark' for
+ * the version-independent one
+ * @return string the URL from the links block
+ */
+ public function findLink($type = 'self')
+ {
+ if (empty($this->links)) {
+ return false;
+ }
+
+ foreach ($this->links as $link) {
+ if ($link->rel == $type) {
+ return $link->href;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * returns the URL used for Create
+ *
+ * @return string
+ */
+ protected function createUrl()
+ {
+ return $this->getParent()->Url($this->ResourceName());
+ }
+
+ /**
+ * Returns the primary key field for the object
+ *
+ * The primary key is usually 'id', but this function is provided so that
+ * (in rare cases where it is not 'id'), it can be overridden.
+ *
+ * @return string
+ */
+ protected function primaryKeyField()
+ {
+ return 'id';
+ }
+
+ /**
+ * Returns the top-level document identifier for the returned response
+ * JSON document; must be overridden in child classes
+ *
+ * For example, a server document is (JSON) `{"server": ...}` and an
+ * Instance document is `{"instance": ...}` - this function must return
+ * the top level document name (either "server" or "instance", in
+ * these examples).
+ *
+ * @throws DocumentError if not overridden
+ */
+ public static function jsonName()
+ {
+ if (isset(static::$json_name)) {
+ return static::$json_name;
+ }
+
+ throw new Exceptions\DocumentError(sprintf(
+ Lang::translate('No JSON object defined for class [%s] in JsonName()'),
+ get_class()
+ ));
+ }
+
+ /**
+ * returns the collection JSON element name
+ *
+ * When an object is returned in a collection, it usually has a top-level
+ * object that is an array holding child objects of the object types.
+ * This static function returns the name of the top-level element. Usually,
+ * that top-level element is simply the JSON name of the resource.'s';
+ * however, it can be overridden by specifying the $json_collection_name
+ * attribute.
+ *
+ * @return string
+ */
+ public static function jsonCollectionName()
+ {
+ if (isset(static::$json_collection_name)) {
+ return static::$json_collection_name;
+ } else {
+ return static::$json_name . 's';
+ }
+ }
+
+ /**
+ * returns the JSON name for each element in a collection
+ *
+ * Usually, elements in a collection are anonymous; this function, however,
+ * provides for an element level name:
+ *
+ * `{ "collection" : [ { "element" : ... } ] }`
+ *
+ * @return string
+ */
+ public static function jsonCollectionElement()
+ {
+ if (isset(static::$json_collection_element)) {
+ return static::$json_collection_element;
+ }
+ }
+
+ /**
+ * Returns the resource name for the URL of the object; must be overridden
+ * in child classes
+ *
+ * For example, a server is `/servers/`, a database instance is
+ * `/instances/`. Must be overridden in child classes.
+ *
+ * @throws UrlError
+ */
+ public static function resourceName()
+ {
+ if (isset(static::$url_resource)) {
+ return static::$url_resource;
+ }
+
+ throw new Exceptions\UrlError(sprintf(
+ Lang::translate('No URL resource defined for class [%s] in ResourceName()'),
+ get_class()
+ ));
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/Curl.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/Curl.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb829afc5f6bd47ab978bed905fce2ebb00df764
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/Curl.php
@@ -0,0 +1,308 @@
+<?php
+
+namespace OpenCloud\Common\Request;
+
+use OpenCloud\Common\Base;
+use OpenCloud\Common\Lang;
+use OpenCloud\Common\Exceptions\HttpRetryError;
+use OpenCloud\Common\Exceptions\HttpUrlError;
+use OpenCloud\Common\Exceptions\HttpTimeoutError;
+use OpenCloud\Common\Exceptions\HttpError;
+
+/**
+ * The CurlRequest class is a simple wrapper to CURL functions. Not only does
+ * this permit stubbing of the interface as described under the HttpRequest
+ * interface, it could potentially allow us to replace the interface methods
+ * with other function calls in the future.
+ *
+ * @api
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ */
+class Curl extends Base implements HttpRequestInterface
+{
+
+ private $url;
+ private $method;
+ private $handle;
+ private $retries = 0;
+ private $headers = array();
+ private $returnheaders = array();
+
+ /**
+ * Initializes the CURL handle and HTTP method
+ *
+ * The constructor also sets a number of default values for options.
+ *
+ * @param string $url the URL to connect to
+ * @param string $method the HTTP method (default "GET")
+ * @param array $options optional hashed array of options => value pairs
+ */
+ public function __construct($url, $method = 'GET', array $options = array())
+ {
+ $this->url = $url;
+ $this->method = $method;
+ $this->handle = curl_init($url);
+
+ // set our options
+ $this->setOption(CURLOPT_CUSTOMREQUEST, $method);
+
+ foreach($options as $opt => $value) {
+ $this->getLogger()->info(Lang::translate('Setting option {key}={val}'), array(
+ 'key' => $opt,
+ 'val' => $value
+ ));
+ $this->setOption($opt, $value);
+ }
+
+ // @codeCoverageIgnoreStart
+ if (RAXSDK_SSL_VERIFYHOST != 2) {
+ $this->getLogger()->warning("WARNING: RAXSDK_SSL_VERIFYHOST has reduced security, value [{value}]", array(
+ 'value' => RAXSDK_SSL_VERIFYHOST
+ ));
+ }
+
+ if (RAXSDK_SSL_VERIFYPEER !== true) {
+ $this->getLogger()->warning("WARNING: RAXSDK_SSL_VERIFYPEER has reduced security");
+ }
+ // @codeCoverageIgnoreEnd
+
+ $this->setOption(CURLOPT_SSL_VERIFYHOST, RAXSDK_SSL_VERIFYHOST);
+ $this->setOption(CURLOPT_SSL_VERIFYPEER, RAXSDK_SSL_VERIFYPEER);
+
+ if (defined('RAXSDK_CACERTPEM') && file_exists(RAXSDK_CACERTPEM)) {
+ $this->setOption(CURLOPT_CAINFO, RAXSDK_CACERTPEM);
+ }
+
+ // curl code [18]
+ // message [transfer closed with x bytes remaining to read]
+ if ($method === 'HEAD') {
+ $this->setOption(CURLOPT_NOBODY, true);
+ }
+
+ // follow redirects
+ $this->setOption(CURLOPT_FOLLOWLOCATION, true);
+
+ // don't return the headers in the request
+ $this->setOption(CURLOPT_HEADER, false);
+
+ // retrieve headers via callback
+ $this->setOption(CURLOPT_HEADERFUNCTION, array($this, '_get_header_cb'));
+
+ // return the entire request on curl_exec()
+ $this->setOption(CURLOPT_RETURNTRANSFER, true);
+
+ // set default timeouts
+ $this->setConnectTimeout(RAXSDK_CONNECTTIMEOUT);
+ $this->setHttpTimeout(RAXSDK_TIMEOUT);
+ }
+
+ /**
+ * Sets a CURL option
+ *
+ * @param const $name - a CURL named constant; e.g. CURLOPT_TIMEOUT
+ * @param mixed $value - the value for the option
+ */
+ public function setOption($name, $value)
+ {
+ return curl_setopt($this->handle, $name, $value);
+ }
+
+ /**
+ * Explicit method for setting the connect timeout
+ *
+ * The connect timeout is the time it takes for the initial connection
+ * request to be established. It is different than the HTTP timeout, which
+ * is the time for the entire request to be serviced.
+ *
+ * @param integer $value The connection timeout in seconds.
+ * Use 0 to wait indefinitely (NOT recommended)
+ */
+ public function setConnectTimeout($value)
+ {
+ $this->setOption(CURLOPT_CONNECTTIMEOUT, $value);
+ }
+
+ /**
+ * Explicit method for setting the HTTP timeout
+ *
+ * The HTTP timeout is the time it takes for the HTTP request to be
+ * serviced. This value is usually larger than the connect timeout
+ * value.
+ *
+ * @param integer $value - the number of seconds to wait before timing out
+ * the HTTP request.
+ */
+ public function setHttpTimeout($value)
+ {
+ $this->setOption(CURLOPT_TIMEOUT, $value);
+ }
+
+ /**
+ * Sets the number of retries
+ *
+ * If you set this to a non-zero value, then it will repeat the request
+ * up to that number.
+ */
+ public function setRetries($value)
+ {
+ $this->retries = $value;
+ }
+
+ /**
+ * Simplified method for setting lots of headers at once
+ *
+ * This method takes an associative array of header/value pairs and calls
+ * the setheader() method on each of them.
+ *
+ * @param array $arr an associative array of headers
+ */
+ public function setheaders($array)
+ {
+ if (!is_array($array)) {
+ throw new HttpError(Lang::translate(
+ 'Value passed to CurlRequest::setheaders() must be array'
+ ));
+ }
+
+ foreach ($array as $name => $value) {
+ $this->setHeader($name, $value);
+ }
+ }
+
+ /**
+ * Sets a single header
+ *
+ * For example, to set the content type to JSON:
+ * `$request->SetHeader('Content-Type','application/json');`
+ *
+ * @param string $name The name of the header
+ * @param mixed $value The value of the header
+ */
+ public function setHeader($name, $value)
+ {
+ $this->headers[$name] = $value;
+ }
+
+ /**
+ * Executes the current request
+ *
+ * This method actually performs the request using the values set
+ * previously. It throws a OpenCloud\HttpError exception on
+ * any CURL error.
+ *
+ * @return OpenCloud\HttpResponse
+ * @throws OpenCloud\HttpError
+ *
+ * @codeCoverageIgnore
+ */
+ public function execute()
+ {
+ // set all the headers
+ $headarr = array();
+
+ foreach ($this->headers as $name => $value) {
+ $headarr[] = $name.': '.$value;
+ }
+
+ $this->setOption(CURLOPT_HTTPHEADER, $headarr);
+
+ // set up to retry if necessary
+ $try_counter = 0;
+
+ do {
+ $data = curl_exec($this->handle);
+ if (curl_errno($this->handle) && ($try_counter<$this->retries)) {
+ $this->getLogger()->info(Lang::translate('Curl error [%d]; retrying [%s]'), array(
+ 'error' => curl_errno($this->handle),
+ 'url' => $this->url
+ ));
+ }
+
+ } while((++$try_counter <= $this->retries) && (curl_errno($this->handle) != 0));
+
+ // log retries error
+ if ($this->retries && curl_errno($this->handle)) {
+ throw new HttpRetryError(sprintf(
+ Lang::translate('No more retries available, last error [%d]'),
+ curl_errno($this->handle)
+ ));
+ }
+
+ // check for CURL errors
+ switch(curl_errno($this->handle)) {
+ case 0:
+ // everything's ok
+ break;
+ case 3:
+ throw new HttpUrlError(sprintf(Lang::translate('Malformed URL [%s]'), $this->url));
+ break;
+ case 28:
+ // timeout
+ throw new HttpTimeoutError(Lang::translate('Operation timed out; check RAXSDK_TIMEOUT value'));
+ break;
+ default:
+ throw new HttpError(sprintf(
+ Lang::translate('HTTP error on [%s], curl code [%d] message [%s]'),
+ $this->url,
+ curl_errno($this->handle),
+ curl_error($this->handle)
+ ));
+ }
+
+ // otherwise, return the HttpResponse
+ return new Response\Http($this, $data);
+ }
+
+ /**
+ * returns an array of information about the request
+ */
+ public function info()
+ {
+ return curl_getinfo($this->handle);
+ }
+
+ /**
+ * returns the most recent CURL error number
+ */
+ public function errno()
+ {
+ return curl_errno($this->handle);
+ }
+
+ /**
+ * returns the most recent CURL error string
+ */
+ public function error()
+ {
+ return curl_error($this->handle);
+ }
+
+ /**
+ * Closes the HTTP request
+ */
+ public function close()
+ {
+ return curl_close($this->handle);
+ }
+
+ /**
+ * Returns the headers as an array
+ */
+ public function returnHeaders()
+ {
+ return $this->returnheaders;
+ }
+
+ /**
+ * This is a callback method used to handle the returned HTTP headers
+ *
+ * @param mixed $ch a CURL handle
+ * @param string $header the header string in its entirety
+ */
+ public function _get_header_cb($ch, $header)
+ {
+ $this->returnheaders[] = $header;
+ return strlen($header);
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/HttpRequestInterface.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/HttpRequestInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..cbe3b5412a130355d57e8294d4c1380b37e57205
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/HttpRequestInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace OpenCloud\Common\Request;
+
+/**
+ * The HttpRequest interface defines methods for wrapping CURL; this allows
+ * those methods to be stubbed out for unit testing, thus allowing us to
+ * test without actually making live calls.
+ */
+interface HttpRequestInterface
+{
+
+ public function SetOption($name, $value);
+
+ public function setheaders($arr);
+
+ public function SetHeader($header, $value);
+
+ public function Execute();
+
+ public function close();
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/Response/Blank.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/Response/Blank.php
new file mode 100644
index 0000000000000000000000000000000000000000..0c79adcef3a06ab647a30703f78250399cc864b0
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/Response/Blank.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace OpenCloud\Common\Request\Response;
+
+class Blank extends Http
+{
+ public $errno;
+ public $error;
+ public $info;
+ public $body;
+ public $headers = array();
+ public $status = 200;
+ public $rawdata;
+
+ public function __construct(array $values = array())
+ {
+ foreach($values as $name => $value) {
+ $this->$name = $value;
+ }
+ }
+
+ public function httpStatus()
+ {
+ return $this->status;
+ }
+
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/Response/Http.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/Response/Http.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7cb9e96346c4c584df39096ace004aace11b2b7
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Request/Response/Http.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace OpenCloud\Common\Request\Response;
+
+use OpenCloud\Common\Base;
+
+/**
+ * The HttpResponse returns an object with status information, separated
+ * headers, and any response body necessary.
+ *
+ * @api
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ */
+
+class Http extends Base
+{
+
+ private $errno;
+ private $error;
+ private $info = array();
+ protected $body;
+ protected $headers = array();
+
+ /**
+ * The constructor parses everything necessary
+ */
+ public function __construct($request, $data)
+ {
+ // save the raw data (who knows? we might need it)
+ $this->setBody($data);
+
+ // and split each line into name: value pairs
+ foreach($request->returnHeaders() as $line) {
+ if (preg_match('/^([^:]+):\s+(.+?)\s*$/', $line, $matches)) {
+ $this->headers[$matches[1]] = $matches[2];
+ } else {
+ $this->headers[$line] = trim($line);
+ }
+ }
+
+ // @codeCoverageIgnoreStart
+ if (isset($this->headers['Cache-Control'])) {
+ $this->getLogger()->info('Cache-Control: {header}', array(
+ 'headers' => $this->headers['Cache-Control']
+ ));
+ }
+ if (isset($this->headers['Expires'])) {
+ $this->getLogger()->info('Expires: {header}', array(
+ 'headers' => $this->headers['Expires']
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ // set some other data
+ $this->info = $request->info();
+ $this->errno = $request->errno();
+ $this->error = $request->error();
+ }
+
+ /**
+ * Returns the full body of the request
+ *
+ * @return string
+ */
+ public function httpBody()
+ {
+ return $this->body;
+ }
+
+ /**
+ * Sets the body.
+ *
+ * @param string $body
+ */
+ public function setBody($body)
+ {
+ $this->body = $body;
+ }
+
+ /**
+ * Returns an array of headers
+ *
+ * @return associative array('header'=>value)
+ */
+ public function headers()
+ {
+ return $this->headers;
+ }
+
+ /**
+ * Returns a single header
+ *
+ * @return string with the value of the requested header, or NULL
+ */
+ public function header($name)
+ {
+ return isset($this->headers[$name]) ? $this->headers[$name] : null;
+ }
+
+ /**
+ * Returns an array of information
+ *
+ * @return array
+ */
+ public function info()
+ {
+ return $this->info;
+ }
+
+ /**
+ * Returns the most recent error number
+ *
+ * @return integer
+ */
+ public function errno()
+ {
+ return $this->errno;
+ }
+
+ /**
+ * Returns the most recent error message
+ *
+ * @return string
+ */
+ public function error()
+ {
+ return $this->error;
+ }
+
+ /**
+ * Returns the HTTP status code
+ *
+ * @return integer
+ */
+ public function httpStatus()
+ {
+ return $this->info['http_code'];
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Service.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Service.php
new file mode 100644
index 0000000000000000000000000000000000000000..5b3aa729a97798ddcd8a80cfca812570fef9a629
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Service.php
@@ -0,0 +1,489 @@
+<?php
+/**
+ * PHP OpenCloud library.
+ *
+ * @copyright Copyright 2013 Rackspace US, Inc. See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.6.0
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\Common;
+
+use OpenCloud\Common\Base;
+use OpenCloud\Common\Lang;
+use OpenCloud\OpenStack;
+use OpenCloud\Common\Exceptions;
+
+/**
+ * This class defines a cloud service; a relationship between a specific OpenStack
+ * and a provided service, represented by a URL in the service catalog.
+ *
+ * Because Service is an abstract class, it cannot be called directly. Provider
+ * services such as Rackspace Cloud Servers or OpenStack Swift are each
+ * subclassed from Service.
+ *
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ */
+
+abstract class Service extends Base
+{
+
+ protected $conn;
+ private $service_type;
+ private $service_name;
+ private $service_region;
+ private $service_url;
+
+ protected $_namespaces = array();
+
+ /**
+ * Creates a service on the specified connection
+ *
+ * Usage: `$x = new Service($conn, $type, $name, $region, $urltype);`
+ * The service's URL is defined in the OpenStack's serviceCatalog; it
+ * uses the $type, $name, $region, and $urltype to find the proper URL
+ * and set it. If it cannot find a URL in the service catalog that matches
+ * the criteria, then an exception is thrown.
+ *
+ * @param OpenStack $conn - a Connection object
+ * @param string $type - the service type (e.g., "compute")
+ * @param string $name - the service name (e.g., "cloudServersOpenStack")
+ * @param string $region - the region (e.g., "ORD")
+ * @param string $urltype - the specified URL from the catalog
+ * (e.g., "publicURL")
+ */
+ public function __construct(
+ OpenStack $conn,
+ $type,
+ $name,
+ $region,
+ $urltype = RAXSDK_URL_PUBLIC,
+ $customServiceUrl = null
+ ) {
+ $this->setConnection($conn);
+ $this->service_type = $type;
+ $this->service_name = $name;
+ $this->service_region = $region;
+ $this->service_url = $customServiceUrl ?: $this->getEndpoint($type, $name, $region, $urltype);
+ }
+
+ /**
+ * Set this service's connection.
+ *
+ * @param type $connection
+ */
+ public function setConnection($connection)
+ {
+ $this->conn = $connection;
+ }
+
+ /**
+ * Get this service's connection.
+ *
+ * @return type
+ */
+ public function getConnection()
+ {
+ return $this->conn;
+ }
+
+ /**
+ * Returns the URL for the Service
+ *
+ * @param string $resource optional sub-resource
+ * @param array $query optional k/v pairs for query strings
+ * @return string
+ */
+ public function url($resource = '', array $param = array())
+ {
+ $baseurl = $this->service_url;
+
+ // use strlen instead of boolean test because '0' is a valid name
+ if (strlen($resource) > 0) {
+ $baseurl = Lang::noslash($baseurl).'/'.$resource;
+ }
+
+ if (!empty($param)) {
+ $baseurl .= '?'.$this->MakeQueryString($param);
+ }
+
+ return $baseurl;
+ }
+
+ /**
+ * Returns the /extensions for the service
+ *
+ * @api
+ * @return array of objects
+ */
+ public function extensions()
+ {
+ $ext = $this->getMetaUrl('extensions');
+ return (is_object($ext) && isset($ext->extensions)) ? $ext->extensions : array();
+ }
+
+ /**
+ * Returns the /limits for the service
+ *
+ * @api
+ * @return array of limits
+ */
+ public function limits()
+ {
+ $limits = $this->getMetaUrl('limits');
+ return (is_object($limits)) ? $limits->limits : array();
+ }
+
+ /**
+ * Performs an authenticated request
+ *
+ * This method handles the addition of authentication headers to each
+ * request. It always adds the X-Auth-Token: header and will add the
+ * X-Auth-Project-Id: header if there is a tenant defined on the
+ * connection.
+ *
+ * @param string $url The URL of the request
+ * @param string $method The HTTP method (defaults to "GET")
+ * @param array $headers An associative array of headers
+ * @param string $body An optional body for POST/PUT requests
+ * @return \OpenCloud\HttpResult
+ */
+ public function request(
+ $url,
+ $method = 'GET',
+ array $headers = array(),
+ $body = null
+ ) {
+
+ $headers['X-Auth-Token'] = $this->conn->Token();
+
+ if ($tenant = $this->conn->Tenant()) {
+ $headers['X-Auth-Project-Id'] = $tenant;
+ }
+
+ return $this->conn->request($url, $method, $headers, $body);
+ }
+
+ /**
+ * returns a collection of objects
+ *
+ * @param string $class the class of objects to fetch
+ * @param string $url (optional) the URL to retrieve
+ * @param mixed $parent (optional) the parent service/object
+ * @return OpenCloud\Common\Collection
+ */
+ public function collection($class, $url = null, $parent = null)
+ {
+ // Set the element names
+ $collectionName = $class::JsonCollectionName();
+ $elementName = $class::JsonCollectionElement();
+
+ // Set the parent if empty
+ if (!$parent) {
+ $parent = $this;
+ }
+
+ // Set the URL if empty
+ if (!$url) {
+ $url = $parent->url($class::ResourceName());
+ }
+
+ // Save debug info
+ $this->getLogger()->info(
+ '{class}:Collection({url}, {collectionClass}, {collectionName})',
+ array(
+ 'class' => get_class($this),
+ 'url' => $url,
+ 'collectionClass' => $class,
+ 'collectionName' => $collectionName
+ )
+ );
+
+ // Fetch the list
+ $response = $this->request($url);
+
+ $this->getLogger()->info('Response {status} [{body}]', array(
+ 'status' => $response->httpStatus(),
+ 'body' => $response->httpBody()
+ ));
+
+ // Check return code
+ if ($response->httpStatus() > 204) {
+ throw new Exceptions\CollectionError(sprintf(
+ Lang::translate('Unable to retrieve [%s] list from [%s], status [%d] response [%s]'),
+ $class,
+ $url,
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+
+ // Handle empty response
+ if (strlen($response->httpBody()) == 0) {
+ return new Collection($parent, $class, array());
+ }
+
+ // Parse the return
+ $object = json_decode($response->httpBody());
+ $this->checkJsonError();
+
+ // See if there's a "next" link
+ // Note: not sure if the current API offers links as top-level structures;
+ // might have to refactor to allow $nextPageUrl as method argument
+ // @codeCoverageIgnoreStart
+ if (isset($object->links) && is_array($object->links)) {
+ foreach($object->links as $link) {
+ if (isset($link->rel) && $link->rel == 'next') {
+ if (isset($link->href)) {
+ $nextPageUrl = $link->href;
+ } else {
+ $this->getLogger()->warning(
+ 'Unexpected [links] found with no [href]'
+ );
+ }
+ }
+ }
+ }
+ // @codeCoverageIgnoreEnd
+
+ // How should we populate the collection?
+ $data = array();
+
+ if (!$collectionName) {
+ // No element name, just a plain object
+ // @codeCoverageIgnoreStart
+ $data = $object;
+ // @codeCoverageIgnoreEnd
+ } elseif (isset($object->$collectionName)) {
+ if (!$elementName) {
+ // The object has a top-level collection name only
+ $data = $object->$collectionName;
+ } else {
+ // The object has element levels which need to be iterated over
+ $data = array();
+ foreach($object->$collectionName as $item) {
+ $subValues = $item->$elementName;
+ unset($item->$elementName);
+ $data[] = array_merge((array)$item, (array)$subValues);
+ }
+ }
+ }
+
+ $collectionObject = new Collection($parent, $class, $data);
+
+ // if there's a $nextPageUrl, then we need to establish a callback
+ // @codeCoverageIgnoreStart
+ if (!empty($nextPageUrl)) {
+ $collectionObject->setNextPageCallback(array($this, 'Collection'), $nextPageUrl);
+ }
+ // @codeCoverageIgnoreEnd
+
+ return $collectionObject;
+ }
+
+ /**
+ * returns the Region associated with the service
+ *
+ * @api
+ * @return string
+ */
+ public function region()
+ {
+ return $this->service_region;
+ }
+
+ /**
+ * returns the serviceName associated with the service
+ *
+ * This is used by DNS for PTR record lookups
+ *
+ * @api
+ * @return string
+ */
+ public function name()
+ {
+ return $this->service_name;
+ }
+
+ /**
+ * Returns a list of supported namespaces
+ *
+ * @return array
+ */
+ public function namespaces()
+ {
+ return (isset($this->_namespaces) && is_array($this->_namespaces)) ? $this->_namespaces : array();
+ }
+
+ /**
+ * Given a service type, name, and region, return the url
+ *
+ * This function ensures that services are represented by an entry in the
+ * service catalog, and NOT by an arbitrarily-constructed URL.
+ *
+ * Note that it will always return the first match found in the
+ * service catalog (there *should* be only one, but you never know...)
+ *
+ * @param string $type The OpenStack service type ("compute" or
+ * "object-store", for example
+ * @param string $name The name of the service in the service catlog
+ * @param string $region The region of the service
+ * @param string $urltype The URL type; defaults to "publicURL"
+ * @return string The URL of the service
+ */
+ private function getEndpoint($type, $name, $region, $urltype = 'publicURL')
+ {
+ $catalog = $this->getConnection()->serviceCatalog();
+
+ // Search each service to find The One
+ foreach ($catalog as $service) {
+ // Find the service by comparing the type ("compute") and name ("openstack")
+ if (!strcasecmp($service->type, $type) && !strcasecmp($service->name, $name)) {
+ foreach($service->endpoints as $endpoint) {
+ // Only set the URL if:
+ // a. It is a regionless service (i.e. no region key set)
+ // b. The region matches the one we want
+ if (isset($endpoint->$urltype) &&
+ (!isset($endpoint->region) || !strcasecmp($endpoint->region, $region))
+ ) {
+ $url = $endpoint->$urltype;
+ }
+ }
+ }
+ }
+
+ // error if not found
+ if (empty($url)) {
+ throw new Exceptions\EndpointError(sprintf(
+ 'No endpoints for service type [%s], name [%s], region [%s] and urlType [%s]',
+ $type,
+ $name,
+ $region,
+ $urltype
+ ));
+ }
+
+ return $url;
+ }
+
+ /**
+ * Constructs a specified URL from the subresource
+ *
+ * Given a subresource (e.g., "extensions"), this constructs the proper
+ * URL and retrieves the resource.
+ *
+ * @param string $resource The resource requested; should NOT have slashes
+ * at the beginning or end
+ * @return \stdClass object
+ */
+ private function getMetaUrl($resource)
+ {
+ $urlBase = $this->getEndpoint(
+ $this->service_type,
+ $this->service_name,
+ $this->service_region,
+ RAXSDK_URL_PUBLIC
+ );
+
+ $url = Lang::noslash($urlBase) . '/' . $resource;
+
+ $response = $this->request($url);
+
+ // check for NOT FOUND response
+ if ($response->httpStatus() == 404) {
+ return array();
+ }
+
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() >= 300) {
+ throw new Exceptions\HttpError(sprintf(
+ Lang::translate('Error accessing [%s] - status [%d], response [%s]'),
+ $urlBase,
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ // we're good; proceed
+ $object = json_decode($response->httpBody());
+
+ $this->checkJsonError();
+
+ return $object;
+ }
+
+ /**
+ * Get all associated resources for this service.
+ *
+ * @access public
+ * @return void
+ */
+ public function getResources()
+ {
+ return $this->resources;
+ }
+
+ /**
+ * Internal method for accessing child namespace from parent scope.
+ *
+ * @return type
+ */
+ protected function getCurrentNamespace()
+ {
+ $namespace = get_class($this);
+ return substr($namespace, 0, strrpos($namespace, '\\'));
+ }
+
+ /**
+ * Resolves fully-qualified classname for associated local resource.
+ *
+ * @param string $resourceName
+ * @return string
+ */
+ protected function resolveResourceClass($resourceName)
+ {
+ $className = substr_count($resourceName, '\\')
+ ? $resourceName
+ : $this->getCurrentNamespace() . '\\Resource\\' . ucfirst($resourceName);
+
+ if (!class_exists($className)) {
+ throw new Exceptions\UnrecognizedServiceError(sprintf(
+ '%s resource does not exist, please try one of the following: %s',
+ $resourceName,
+ implode(', ', $this->getResources())
+ ));
+ }
+
+ return $className;
+ }
+
+ /**
+ * Factory method for instantiating resource objects.
+ *
+ * @access public
+ * @param string $resourceName
+ * @param mixed $info (default: null)
+ * @return object
+ */
+ public function resource($resourceName, $info = null)
+ {
+ $className = $this->resolveResourceClass($resourceName);
+ return new $className($this, $info);
+ }
+
+ /**
+ * Factory method for instantiate a resource collection.
+ *
+ * @param string $resourceName
+ * @param string|null $url
+ * @return Collection
+ */
+ public function resourceList($resourceName, $url = null, $service = null)
+ {
+ $className = $this->resolveResourceClass($resourceName);
+ return $this->collection($className, $url, $service);
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/ServiceCatalogItem.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/ServiceCatalogItem.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e20bcbc7b9fa4f3c1278e965b955f208d014212
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/ServiceCatalogItem.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace OpenCloud\Common;
+
+/**
+ * Holds information on a single service from the Service Catalog
+ */
+class ServiceCatalogItem
+{
+
+ public function __construct($info = array())
+ {
+ foreach($info as $key => $value) {
+ $this->$key = $value;
+ }
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Globals.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Globals.php
new file mode 100644
index 0000000000000000000000000000000000000000..fbdc4355e02212c2d9d3be6efabcb468c89e5d83
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Globals.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * Defines global constants and functions
+ *
+ * @copyright 2012-2013 Rackspace Hosting, Inc.
+ * See COPYING for licensing information
+ *
+ * @package phpOpenCloud
+ * @version 1.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ */
+
+namespace OpenCloud;
+
+/**
+ * This file contains only configuration data such as constants.
+ * You can override these constants by defining them BEFORE you including
+ * any of the top-level files from the SDK.
+ *
+ * Definitions:
+ * * RAXSDK_TIMEZONE - the default timezone for interpreting date/time requests
+ * * RAXSDK_STRICT_PROPERTY_CHECKS - if TRUE, the library will strictly enforce
+ * property names on objects; only properties that are pre-defined or
+ * appear in the extensions aliases for the service will be permitted.
+ * When FALSE (the default), then any property can be set on an object.
+ * * RAXSDK_COMPUTE_NAME - the default name for the compute service
+ * * RAXSDK_COMPUTE_REGION - the default region for the compute service
+ * * RAXSDK_COMPUTE_URLTYPE - the default URL type for the compute service
+ * * RAXSDK_OBJSTORE_NAME - the default name for the object storage service
+ * * RAXSDK_OBJSTORE_REGION - the default region for the object storage service
+ * * RAXSDK_OBJSTORE_URLTYPE - the default URL type for the object storage
+ * service
+ * * RAXSDK_DATABASE_NAME - the default name for the DbService service
+ * * RAXSDK_DATABASE_REGION - the default region for the DbService service
+ * * RAXSDK_DATABASE_URLTYPE - the default URL type for the DbService service
+ * * RAXSDK_CONNECTTIMEOUT - the time (in seconds) to wait for a connection
+ * to a service
+ * * RAXSDK_TIMEOUT - the max time (in seconds) to wait for an HTTP request
+ * to complete
+ * * RAXSDK_SERVER_MAXTIMEOUT - the max time (in seconds) that a server
+ * will wait for a change in status (Server::WaitFor() method)
+ * * RAXSDK_POLL_INTERVAL - how often (in seconds) the Server::WaitFor() method
+ * will poll for a status change
+ * * RAXSDK_DEFAULT_IP_VERSION - the default IP version (4 or 6) to return for
+ * the server's primary IP address
+ * * RAXSDK_OVERLIMIT_TIMEOUT - the max time (in seconds) to wait before
+ * retrying a request that has failed because of rate limits. If the
+ * next available time for the request is more than (X) seconds away,
+ * then the request will fail; otherwise, the request will sleep until
+ * available.
+ */
+
+if (!defined('RAXSDK_TIMEZONE'))
+ define('RAXSDK_TIMEZONE', 'America/Chicago');
+if (!defined('RAXSDK_STRICT_PROPERTY_CHECKS'))
+ define('RAXSDK_STRICT_PROPERTY_CHECKS', FALSE);
+if (!defined('RAXSDK_COMPUTE_NAME'))
+ define('RAXSDK_COMPUTE_NAME', 'cloudServersOpenStack');
+if (!defined('RAXSDK_COMPUTE_REGION'))
+ define('RAXSDK_COMPUTE_REGION', NULL);
+if (!defined('RAXSDK_COMPUTE_URLTYPE'))
+ define('RAXSDK_COMPUTE_URLTYPE', 'publicURL');
+if (!defined('RAXSDK_MONITORING_NAME'))
+ define('RAXSDK_MONITORING_NAME', 'cloudMonitoring');
+if (!defined('RAXSDK_MONITORING_REGION'))
+ define('RAXSDK_MONITORING_REGION', '{ignore}');
+if (!defined('RAXSDK_MONITORING_URLTYPE'))
+ define('RAXSDK_MONITORING_URLTYPE', 'publicURL');
+if (!defined('RAXSDK_ORCHESTRATION_NAME'))
+ define('RAXSDK_ORCHESTRATION_NAME', 'cloudOrchestration');
+if (!defined('RAXSDK_ORCHESTRATION_REGION'))
+ define('RAXSDK_ORCHESTRATION_REGION', NULL);
+if (!defined('RAXSDK_ORCHESTRATION_URLTYPE'))
+ define('RAXSDK_ORCHESTRATION_URLTYPE', 'publicURL');
+if (!defined('RAXSDK_OBJSTORE_NAME'))
+ define('RAXSDK_OBJSTORE_NAME', 'cloudFiles');
+if (!defined('RAXSDK_OBJSTORE_REGION'))
+ define('RAXSDK_OBJSTORE_REGION', NULL);
+if (!defined('RAXSDK_OBJSTORE_URLTYPE'))
+ define('RAXSDK_OBJSTORE_URLTYPE', 'publicURL');
+if (!defined('RAXSDK_DATABASE_NAME'))
+ define('RAXSDK_DATABASE_NAME', 'cloudDatabases');
+if (!defined('RAXSDK_DATABASE_REGION'))
+ define('RAXSDK_DATABASE_REGION', NULL);
+if (!defined('RAXSDK_DATABASE_URLTYPE'))
+ define('RAXSDK_DATABASE_URLTYPE', 'publicURL');
+if (!defined('RAXSDK_VOLUME_NAME'))
+ define('RAXSDK_VOLUME_NAME', 'cloudBlockStorage');
+if (!defined('RAXSDK_VOLUME_REGION'))
+ define('RAXSDK_VOLUME_REGION', NULL);
+if (!defined('RAXSDK_VOLUME_URLTYPE'))
+ define('RAXSDK_VOLUME_URLTYPE', 'publicURL');
+if (!defined('RAXSDK_LBSERVICE_NAME'))
+ define('RAXSDK_LBSERVICE_NAME', 'cloudLoadBalancers');
+if (!defined('RAXSDK_LBSERVICE_REGION'))
+ define('RAXSDK_LBSERVICE_REGION', NULL);
+if (!defined('RAXSDK_LBSERVICE_URLTYPE'))
+ define('RAXSDK_LBSERVICE_URLTYPE', 'publicURL');
+if (!defined('RAXSDK_DNS_NAME'))
+ define('RAXSDK_DNS_NAME', 'cloudDNS');
+if (!defined('RAXSDK_DNS_REGION'))
+ define('RAXSDK_DNS_REGION', '{ignore}'); // DNS is regionless
+if (!defined('RAXSDK_DNS_URLTYPE'))
+ define('RAXSDK_DNS_URLTYPE', 'publicURL');
+if (!defined('RAXSDK_AUTOSCALE_NAME'))
+ define('RAXSDK_AUTOSCALE_NAME', 'autoscale');
+if (!defined('RAXSDK_AUTOSCALE_REGION'))
+ define('RAXSDK_AUTOSCALE_REGION', NULL);
+if (!defined('RAXSDK_AUTOSCALE_URLTYPE'))
+ define('RAXSDK_AUTOSCALE_URLTYPE', 'publicURL');
+if (!defined('RAXSDK_DNS_ASYNC_TIMEOUT'))
+ define('RAXSDK_DNS_ASYNC_TIMEOUT', 60);
+if (!defined('RAXSDK_DNS_ASYNC_INTERVAL'))
+ define('RAXSDK_DNS_ASYNC_INTERVAL', 1);
+if (!defined('RAXSDK_CONNECTTIMEOUT'))
+ define('RAXSDK_CONNECTTIMEOUT', 5);
+if (!defined('RAXSDK_TIMEOUT'))
+ define('RAXSDK_TIMEOUT', 60);
+if (!defined('RAXSDK_SERVER_MAXTIMEOUT'))
+ define('RAXSDK_SERVER_MAXTIMEOUT', 3600);
+if (!defined('RAXSDK_POLL_INTERVAL'))
+ define('RAXSDK_POLL_INTERVAL', 10);
+if (!defined('RAXSDK_DEFAULT_IP_VERSION'))
+ define('RAXSDK_DEFAULT_IP_VERSION', 4);
+if (!defined('RAXSDK_OVERLIMIT_TIMEOUT'))
+ define('RAXSDK_OVERLIMIT_TIMEOUT', 300);
+/**
+ * sets default (highly secure) value for CURLOPT_SSL_VERIFYHOST. If you
+ * are using a self-signed SSL certificate, you can reduce this setting, but
+ * you do so at your own risk.
+ */
+if (!defined('RAXSDK_SSL_VERIFYHOST'))
+ define('RAXSDK_SSL_VERIFYHOST', 2);
+/**
+ * sets default (highly secure) value for CURLOPT_SSL_VERIFYPEER. If you
+ * are using a self-signed SSL certificate, you can reduce this setting, but
+ * you do so at your own risk.
+ */
+if (!defined('RAXSDK_SSL_VERIFYPEER'))
+ define('RAXSDK_SSL_VERIFYPEER', TRUE);
+
+/**
+ * edit and uncomment this to set the default location of cacert.pem file
+ */
+//define('RAXSDK_CACERTPEM', __DIR__ . DIRECTORY_SEPARATOR . 'cacert.pem');
+
+/* these should not be overridden */
+define('RAXSDK_VERSION', '1.5.10');
+define('RAXSDK_USER_AGENT', 'php-opencloud/'.RAXSDK_VERSION.' (Rackspace)');
+define('RAXSDK_ERROR', 'Error:');
+define('RAXSDK_FATAL', 'FATAL ERROR:');
+define('RAXSDK_TERMINATED', '*** PROCESSING HALTED ***');
+define('RAXSDK_CONTENT_TYPE_JSON', 'application/json');
+define('RAXSDK_URL_PUBLIC', 'publicURL');
+define('RAXSDK_URL_INTERNAL', 'internalURL');
+define('RAXSDK_URL_VERSION_INFO', 'versionInfo');
+define('RAXSDK_URL_VERSION_LIST', 'versionList');
+
+/**
+ * definitions for Rackspace authentication endpoints
+ */
+define('RACKSPACE_US', 'https://identity.api.rackspacecloud.com/v2.0/');
+define('RACKSPACE_UK', 'https://lon.identity.api.rackspacecloud.com/v2.0/');
+
+/**
+ * We can re-authenticate this many seconds before the token expires
+ *
+ * Set this to a higher value if your service does not cache tokens; if
+ * it *does* cache them, then this value is not required.
+ */
+define('RAXSDK_FUDGE', 0);
+
+/**
+ * Readable constants
+ */
+define('RAXSDK_SOFT_REBOOT', 'soft');
+define('RAXSDK_HARD_REBOOT', 'hard');
+define('RAXSDK_DETAILS', TRUE);
+define('RAXSDK_MAX_CONTAINER_NAME_LEN', 256);
+
+/**
+ * UUID of the Rackspace 'public' network
+ */
+define('RAX_PUBLIC','00000000-0000-0000-0000-000000000000');
+/**
+ * UUID of the Rackspace 'private' network
+ */
+define('RAX_PRIVATE','11111111-1111-1111-1111-111111111111');
+
+// Turn off debug mode by default
+define('RAXSDK_DEBUG', false);
+
+/********** TIMEZONE MAGIC **********/
+
+/**
+ * This is called if there is an error getting the default timezone;
+ * that means that the default timezone isn't set.
+ *
+ * @codeCoverageIgnore
+ */
+function __raxsdk_timezone_set($errno, $errstr) {
+ if ($errno==2)
+ date_default_timezone_set(RAXSDK_TIMEZONE);
+ else
+ die(sprintf("Unknown error %d: %s\n", $errno, $errstr));
+}
+set_error_handler('\OpenCloud\__raxsdk_timezone_set');
+@date_default_timezone_get();
+restore_error_handler();
+
+/********** SOME GLOBAL FUNCTIONS **********/
+
+ /**
+ * \OpenCloud\Common\Lang::translate() - this function should be used to wrap all static strings. In the future,
+ * this may provide us with a hook for providing different language
+ * translations.
+ *
+ * @codeCoverageIgnore
+ */
+ function define_gettext() {
+ function translate($str) {
+ return $str;
+ }
+ }
+
+ if (!function_exists('_'))
+ define_gettext();
+
+ /**
+ * removes trailing slash(es) from a URL string
+ *
+ * Mainly, this is just for appearance's sake. I really hate to see
+ * URLs like .../servers//address, for some reason.
+ *
+ * @codeCoverageIgnore
+ */
+ function noslash($str) {
+ while ($str && (substr($str, -1) == '/'))
+ $str = substr($str, 0, strlen($str)-1);
+ return $str;
+ }
+
+ /**
+ * Turns debugging on or off
+ *
+ * @codeCoverageIgnore
+ */
+ function setDebug($state=TRUE) {
+ global $RAXSDK_DEBUG;
+ $RAXSDK_DEBUG=$state;
+ }
+
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/AbstractService.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/AbstractService.php
new file mode 100644
index 0000000000000000000000000000000000000000..4a2298d60ed69097216d346bc3c3b3f015f85d67
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/AbstractService.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHP OpenCloud library.
+ *
+ * @copyright Copyright 2013 Rackspace US, Inc. See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.6.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\ObjectStore;
+
+use OpenCloud\Common\Service as CommonService;
+
+define('SWIFT_MAX_OBJECT_SIZE', 5 * 1024 * 1024 * 1024 + 1);
+
+/**
+ * An abstract base class for common code shared between ObjectStore\Service
+ * (container) and ObjectStore\CDNService (CDN containers).
+ *
+ * @todo Maybe we use Traits instead of this small abstract class?
+ */
+abstract class AbstractService extends CommonService
+{
+
+ const MAX_CONTAINER_NAME_LEN = 256;
+ const MAX_OBJECT_NAME_LEN = 1024;
+ const MAX_OBJECT_SIZE = SWIFT_MAX_OBJECT_SIZE;
+
+ /**
+ * Creates a Container resource object.
+ *
+ * @param mixed $cdata The name of the container or an object from which to set values
+ * @return OpenCloud\ObjectStore\Resource\Container
+ */
+ public function container($cdata = null)
+ {
+ return new Resource\Container($this, $cdata);
+ }
+
+ /**
+ * Returns a Collection of Container objects.
+ *
+ * @param array $filter An array to filter the results
+ * @return OpenCloud\Common\Collection
+ */
+ public function containerList(array $filter = array())
+ {
+ $filter['format'] = 'json';
+
+ return $this->collection(
+ 'OpenCloud\ObjectStore\Resource\Container', $this->url(null, $filter)
+ );
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/CDNService.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/CDNService.php
new file mode 100644
index 0000000000000000000000000000000000000000..132d5f47ad6d6f5e2a7fc12d747c7d9b202e50c2
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/CDNService.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * PHP OpenCloud library.
+ *
+ * @copyright Copyright 2013 Rackspace US, Inc. See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.6.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\ObjectStore;
+
+use OpenCloud\OpenStack;
+use OpenCloud\Common\Exceptions;
+
+/**
+ * This is the CDN version of the ObjectStore service.
+ */
+class CDNService extends AbstractService
+{
+
+ /**
+ * Creates a new CDNService object.
+ *
+ * This is a simple wrapper function around the parent Service construct,
+ * but supplies defaults for the service type.
+ *
+ * @param OpenCloud\OpenStack $connection The connection object
+ * @param string $serviceName The name of the service
+ * @param string $serviceRegion The service's region
+ * @param string $urlType The type of URL (normally 'publicURL')
+ */
+ public function __construct(
+ OpenStack $connection,
+ $serviceName = RAXSDK_OBJSTORE_NAME,
+ $serviceRegion = RAXSDK_OBJSTORE_REGION,
+ $urltype = RAXSDK_URL_PUBLIC
+ ) {
+ $this->getLogger()->info('Initializing CDN Service...');
+
+ parent::__construct(
+ $connection,
+ 'rax:object-cdn',
+ $serviceName,
+ $serviceRegion,
+ $urltype
+ );
+ }
+
+ /**
+ * Helps catch errors if someone calls the method on the
+ * wrong object
+ */
+ public function CDN()
+ {
+ throw new Exceptions\CdnError(
+ 'Invalid method call; no CDN() on the CDN object'
+ );
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/AbstractStorageObject.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/AbstractStorageObject.php
new file mode 100644
index 0000000000000000000000000000000000000000..c6799b22b7eaa85a61bd0275cc12963621f7f02f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/AbstractStorageObject.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * PHP OpenCloud library.
+ *
+ * @copyright Copyright 2013 Rackspace US, Inc. See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.6.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\ObjectStore\Resource;
+
+use OpenCloud\Common\Base;
+use OpenCloud\Common\Metadata;
+use OpenCloud\Common\Exceptions\NameError;
+use OpenCloud\Common\Exceptions\MetadataPrefixError;
+use OpenCloud\Common\Request\Response\Http;
+
+/**
+ * Abstract base class which implements shared functionality of ObjectStore
+ * resources. Provides support, for example, for metadata-handling and other
+ * features that are common to the ObjectStore components.
+ */
+abstract class AbstractStorageObject extends Base
+{
+
+ const ACCOUNT_META_PREFIX = 'X-Account-';
+ const CONTAINER_META_PREFIX = 'X-Container-Meta-';
+ const OBJECT_META_PREFIX = 'X-Object-Meta-';
+ const CDNCONTAINER_META_PREFIX = 'X-Cdn-';
+
+ /**
+ * Metadata belonging to a resource.
+ *
+ * @var OpenCloud\Common\Metadata
+ */
+ public $metadata;
+
+ /**
+ * Initializes the metadata component
+ */
+ public function __construct()
+ {
+ $this->metadata = new Metadata;
+ }
+
+ /**
+ * Given an Http response object, converts the appropriate headers
+ * to metadata
+ *
+ * @param OpenCloud\Common\Request\Response\Http
+ * @return void
+ */
+ public function getMetadata(Http $response)
+ {
+ $this->metadata = new Metadata;
+ $this->metadata->setArray($response->headers(), $this->prefix());
+ }
+
+ /**
+ * If object has metadata, return an associative array of headers.
+ *
+ * For example, if a DataObject has a metadata item named 'FOO',
+ * then this would return array('X-Object-Meta-FOO'=>$value);
+ *
+ * @return array
+ */
+ public function metadataHeaders()
+ {
+ $headers = array();
+
+ // only build if we have metadata
+ if (is_object($this->metadata)) {
+ foreach ($this->metadata as $key => $value) {
+ $headers[$this->prefix() . $key] = $value;
+ }
+ }
+
+ return $headers;
+ }
+
+ /**
+ * Returns the displayable name of the object
+ *
+ * Can be overridden by child objects; *must* be overridden by child
+ * objects if the object does not have a `name` attribute defined.
+ *
+ * @api
+ * @throws NameError if attribute 'name' is not defined
+ */
+ public function name()
+ {
+ if (property_exists($this, 'name')) {
+ return $this->name;
+ } else {
+ throw new NameError(sprintf(
+ 'Name attribute does not exist for [%s]',
+ get_class($this)
+ ));
+ }
+ }
+
+ /**
+ * Override parent method.
+ *
+ * @return null
+ */
+ public static function jsonName()
+ {
+ return null;
+ }
+
+ /**
+ * Override parent method.
+ *
+ * @return null
+ */
+ public static function jsonCollectionName()
+ {
+ return null;
+ }
+
+ /**
+ * Override parent method.
+ *
+ * @return null
+ */
+ public static function jsonCollectionElement()
+ {
+ return null;
+ }
+
+ /**
+ * Returns the proper prefix for the specified type of object
+ *
+ * @param string $type The type of object; derived from `get_class()` if not
+ * specified.
+ * @codeCoverageIgnore
+ */
+ private function prefix($type = null)
+ {
+ if ($type === null) {
+ $parts = preg_split('/\\\/', get_class($this));
+ $type = $parts[count($parts)-1];
+ }
+
+ switch($type) {
+ case 'Account':
+ $prefix = self::ACCOUNT_META_PREFIX;
+ break;
+ case 'CDNContainer':
+ $prefix = self::CDNCONTAINER_META_PREFIX;
+ break;
+ case 'Container':
+ $prefix = self::CONTAINER_META_PREFIX;
+ break;
+ case 'DataObject':
+ $prefix = self::OBJECT_META_PREFIX;
+ break;
+ default:
+ throw new MetadataPrefixError(sprintf(
+ 'Unrecognized metadata type [%s]',
+ $type
+ ));
+ }
+
+ return $prefix;
+ }
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/CDNContainer.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/CDNContainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b6367c87e0eeb404cf2dc2d45ab9554db6ef804
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/CDNContainer.php
@@ -0,0 +1,298 @@
+<?php
+/**
+ * PHP OpenCloud library.
+ *
+ * @copyright Copyright 2013 Rackspace US, Inc. See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.6.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\ObjectStore\Resource;
+
+use OpenCloud\Common\Service as AbstractService;
+use OpenCloud\Common\Lang;
+use OpenCloud\Common\Exceptions;
+use OpenCloud\ObjectStore\AbstractService as AbstractObjectService;
+
+/**
+ * A container that has been CDN-enabled. Each CDN-enabled container has a unique
+ * Uniform Resource Locator (URL) that can be combined with its object names and
+ * openly distributed in web pages, emails, or other applications.
+ */
+class CDNContainer extends AbstractStorageObject
+{
+ /**
+ * The name of the container.
+ *
+ * The only restrictions on container names is that they cannot contain a
+ * forward slash (/) and must be less than 256 bytes in length. Please note
+ * that the length restriction applies to the name after it has been URL
+ * encoded. For example, a container named Course Docs would be URL encoded
+ * as Course%20Docs - which is 13 bytes in length rather than the expected 11.
+ *
+ * @var string
+ */
+ public $name;
+
+ /**
+ * Count of how many objects exist in the container.
+ *
+ * @var int
+ */
+ public $count = 0;
+
+ /**
+ * The total bytes used in the container.
+ *
+ * @var int
+ */
+ public $bytes = 0;
+
+ /**
+ * The service object.
+ *
+ * @var AbstractService
+ */
+ private $service;
+
+ /**
+ * URL of the container.
+ *
+ * @var string
+ */
+ private $containerUrl;
+
+ /**
+ * Creates the container object
+ *
+ * Creates a new container object or, if the $cdata object is a string,
+ * retrieves the named container from the object store. If $cdata is an
+ * array or an object, then its values are used to set this object.
+ *
+ * @param OpenCloud\ObjectStore $service - the ObjectStore service
+ * @param mixed $cdata - if supplied, the name of the object
+ */
+ public function __construct(AbstractService $service, $cdata = null)
+ {
+ $this->getLogger()->info('Initializing CDN Container Service...');
+
+ parent::__construct();
+
+ $this->service = $service;
+
+ // Populate data if set
+ $this->populate($cdata);
+ }
+
+ /**
+ * Allow other objects to know what the primary key is.
+ *
+ * @return string
+ */
+ public function primaryKeyField()
+ {
+ return 'name';
+ }
+
+ /**
+ * Returns the Service associated with the Container
+ */
+ public function getService()
+ {
+ return $this->service;
+ }
+
+ /**
+ * Returns the URL of the container
+ *
+ * @return string
+ * @param string $subresource not used; required for compatibility
+ * @throws NoNameError
+ */
+ public function url($subresource = '')
+ {
+ if (strlen($this->name) == 0) {
+ throw new Exceptions\NoNameError(
+ Lang::translate('Container does not have an identifier')
+ );
+ }
+
+ return Lang::noslash($this->getService()->url(rawurlencode($this->name)));
+ }
+
+ /**
+ * Creates a new container with the specified attributes
+ *
+ * @param array $params array of parameters
+ * @return boolean TRUE on success; FALSE on failure
+ * @throws ContainerCreateError
+ */
+ public function create($params = array())
+ {
+ // Populate object and check container name
+ $this->populate($params);
+ $this->isValidName($this->name);
+
+ // Dispatch
+ $this->containerUrl = $this->url();
+ $response = $this->getService()->request($this->url(), 'PUT', $this->metadataHeaders());
+
+ // Check return code
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() > 202) {
+ throw new Exceptions\ContainerCreateError(sprintf(
+ Lang::translate('Problem creating container [%s] status [%d] response [%s]'),
+ $this->url(),
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return true;
+ }
+
+ /**
+ * Updates the metadata for a container
+ *
+ * @return boolean TRUE on success; FALSE on failure
+ * @throws ContainerCreateError
+ */
+ public function update()
+ {
+ $response = $this->getService()->request($this->url(), 'POST', $this->metadataHeaders());
+
+ // check return code
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() > 204) {
+ throw new Exceptions\ContainerCreateError(sprintf(
+ Lang::translate('Problem updating container [%s] status [%d] response [%s]'),
+ $this->Url(),
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return true;
+ }
+
+ /**
+ * Deletes the specified container
+ *
+ * @return boolean TRUE on success; FALSE on failure
+ * @throws ContainerDeleteError
+ */
+ public function delete()
+ {
+ $response = $this->getService()->request($this->url(), 'DELETE');
+
+ // validate the response code
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() == 404) {
+ throw new Exceptions\ContainerNotFoundError(sprintf(
+ Lang::translate('Container [%s] not found'),
+ $this->name
+ ));
+ }
+
+ if ($response->httpStatus() == 409) {
+ throw new Exceptions\ContainerNotEmptyError(sprintf(
+ Lang::translate('Container [%s] must be empty before deleting'),
+ $this->name
+ ));
+ }
+
+ if ($response->httpStatus() >= 300) {
+ throw new Exceptions\ContainerDeleteError(sprintf(
+ Lang::translate('Problem deleting container [%s] status [%d] response [%s]'),
+ $this->url(),
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ return false;
+ }
+ // @codeCoverageIgnoreEnd
+
+ return true;
+ }
+
+ /**
+ * Loads the object from the service
+ *
+ * @return void
+ */
+ public function refresh($name = null, $url = null)
+ {
+ $response = $this->getService()->request(
+ $this->url($name), 'HEAD', array('Accept' => '*/*')
+ );
+
+ // validate the response code
+ // @codeCoverageIgnoreStart
+ if ($response->HttpStatus() == 404) {
+ throw new Exceptions\ContainerNotFoundError(sprintf(
+ 'Container [%s] (%s) not found',
+ $this->name,
+ $this->url()
+ ));
+ }
+
+ if ($response->HttpStatus() >= 300) {
+ throw new Exceptions\HttpError(sprintf(
+ 'Error retrieving Container, status [%d] response [%s]',
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+
+ // check for headers (not metadata)
+ foreach($response->headers() as $header => $value) {
+ switch($header) {
+ case 'X-Container-Object-Count':
+ $this->count = $value;
+ break;
+ case 'X-Container-Bytes-Used':
+ $this->bytes = $value;
+ break;
+ }
+ }
+ // @codeCoverageIgnoreEnd
+
+ // parse the returned object
+ $this->getMetadata($response);
+ }
+
+ /**
+ * Validates that the container name is acceptable
+ *
+ * @param string $name the container name to validate
+ * @return boolean TRUE if ok; throws an exception if not
+ * @throws ContainerNameError
+ */
+ public function isValidName($name)
+ {
+ if (strlen($name) == 0) {
+ throw new Exceptions\ContainerNameError(
+ 'Container name cannot be blank'
+ );
+ }
+
+ if (strpos($name, '/') !== false) {
+ throw new Exceptions\ContainerNameError(
+ 'Container name cannot contain "/"'
+ );
+ }
+
+ if (strlen($name) > AbstractObjectService::MAX_CONTAINER_NAME_LEN) {
+ throw new Exceptions\ContainerNameError(
+ 'Container name is too long'
+ );
+ }
+
+ return true;
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/Container.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/Container.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a56ebd9fcafbbd23de9502680191b9bf9b1be23
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/Container.php
@@ -0,0 +1,401 @@
+<?php
+/**
+ * PHP OpenCloud library.
+ *
+ * @copyright Copyright 2013 Rackspace US, Inc. See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.6.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\ObjectStore\Resource;
+
+use OpenCloud\Common\Exceptions;
+use OpenCloud\Common\Lang;
+
+/**
+ * A container is a storage compartment for your data and provides a way for you
+ * to organize your data. You can think of a container as a folder in Windows®
+ * or a directory in UNIX®. The primary difference between a container and these
+ * other file system concepts is that containers cannot be nested.
+ *
+ * A container can also be CDN-enabled (for public access), in which case you
+ * will need to interact with a CDNContainer object instead of this one.
+ */
+class Container extends CDNContainer
+{
+
+ /**
+ * CDN container (if set).
+ *
+ * @var CDNContainer|null
+ */
+ private $cdn;
+
+ /**
+ * Sets the CDN container.
+ *
+ * @param OpenCloud\ObjectStore\Resource\CDNContainer $cdn
+ */
+ public function setCDN(CDNContainer $cdn)
+ {
+ $this->cdn = $cdn;
+ }
+
+ /**
+ * Returns the CDN container.
+ *
+ * @returns CDNContainer
+ */
+ public function getCDN()
+ {
+ if (!$this->cdn) {
+ throw new Exceptions\CdnNotAvailableError(
+ Lang::translate('CDN-enabled container is not available')
+ );
+ }
+
+ return $this->cdn;
+ }
+
+ /**
+ * Backwards compatability.
+ */
+ public function CDN()
+ {
+ return $this->getCDN();
+ }
+
+ /**
+ * Makes the container public via the CDN
+ *
+ * @api
+ * @param integer $TTL the Time-To-Live for the CDN container; if NULL,
+ * then the cloud's default value will be used for caching.
+ * @throws CDNNotAvailableError if CDN services are not available
+ * @return CDNContainer
+ */
+ public function enableCDN($ttl = null)
+ {
+ $url = $this->getService()->CDN()->url() . '/' . rawurlencode($this->name);
+
+ $headers = $this->metadataHeaders();
+
+ if ($ttl) {
+
+ // Make sure we're dealing with a real figure
+ if (!is_integer($ttl)) {
+ throw new Exceptions\CdnTtlError(sprintf(
+ Lang::translate('TTL value [%s] must be an integer'),
+ $ttl
+ ));
+ }
+
+ $headers['X-TTL'] = $ttl;
+ }
+
+ $headers['X-Log-Retention'] = 'True';
+ $headers['X-CDN-Enabled'] = 'True';
+
+ // PUT to the CDN container
+ $response = $this->getService()->request($url, 'PUT', $headers);
+
+ // check the response status
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() > 202) {
+ throw new Exceptions\CdnHttpError(sprintf(
+ Lang::translate('HTTP error publishing to CDN, status [%d] response [%s]'),
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ // refresh the data
+ $this->refresh();
+
+ // return the CDN container object
+ $cdn = new CDNContainer($this->getService()->getCDNService(), $this->name);
+ $this->setCDN($cdn);
+
+ return $cdn;
+ }
+
+ /**
+ * Backwards compatability.
+ */
+ public function publishToCDN($ttl = null)
+ {
+ return $this->enableCDN($ttl);
+ }
+
+ /**
+ * Disables the containers CDN function.
+ *
+ * Note that the container will still be available on the CDN until
+ * its TTL expires.
+ *
+ * @api
+ * @return void
+ */
+ public function disableCDN()
+ {
+ // Set necessary headers
+ $headers['X-Log-Retention'] = 'False';
+ $headers['X-CDN-Enabled'] = 'False';
+
+ // PUT it to the CDN service
+ $response = $this->getService()->request($this->CDNURL(), 'PUT', $headers);
+
+ // check the response status
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() != 201) {
+ throw new Exceptions\CdnHttpError(sprintf(
+ Lang::translate('HTTP error disabling CDN, status [%d] response [%s]'),
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return true;
+ }
+
+ /**
+ * Creates a static website from the container
+ *
+ * @api
+ * @link http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_Static_Website-dle4000.html
+ * @param string $index the index page (starting page) of the website
+ * @return \OpenCloud\HttpResponse
+ */
+ public function createStaticSite($indexHtml)
+ {
+ $headers = array('X-Container-Meta-Web-Index' => $indexHtml);
+ $response = $this->getService()->request($this->url(), 'POST', $headers);
+
+ // check return code
+ // @codeCoverageIgnoreStart
+ if ($response->HttpStatus() > 204) {
+ throw new Exceptions\ContainerError(sprintf(
+ Lang::translate('Error creating static website for [%s], status [%d] response [%s]'),
+ $this->name,
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return $response;
+ }
+
+ /**
+ * Sets the error page(s) for the static website
+ *
+ * @api
+ * @link http://docs.rackspace.com/files/api/v1/cf-devguide/content/Set_Error_Pages_for_Static_Website-dle4005.html
+ * @param string $name the name of the error page
+ * @return \OpenCloud\HttpResponse
+ */
+ public function staticSiteErrorPage($name)
+ {
+ $headers = array('X-Container-Meta-Web-Error' => $name);
+ $response = $this->getService()->request($this->url(), 'POST', $headers);
+
+ // check return code
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() > 204) {
+ throw new Exceptions\ContainerError(sprintf(
+ Lang::translate('Error creating static site error page for [%s], status [%d] response [%s]'),
+ $this->name,
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+
+ return $response;
+ // @codeCoverageIgnoreEnd
+ }
+
+ /**
+ * Returns the CDN URL of the container (if enabled)
+ *
+ * The CDNURL() is used to manage the container. Note that it is different
+ * from the PublicURL() of the container, which is the publicly-accessible
+ * URL on the network.
+ *
+ * @api
+ * @return string
+ */
+ public function CDNURL()
+ {
+ return $this->getCDN()->url();
+ }
+
+ /**
+ * Returns the Public URL of the container (on the CDN network)
+ *
+ */
+ public function publicURL()
+ {
+ return $this->CDNURI();
+ }
+
+ /**
+ * Returns the CDN info about the container
+ *
+ * @api
+ * @return stdClass
+ */
+ public function CDNinfo($property = null)
+ {
+ // Not quite sure why this is here...
+ // @codeCoverageIgnoreStart
+ if ($this->getService() instanceof CDNService) {
+ return $this->metadata;
+ }
+ // @codeCoverageIgnoreEnd
+
+ // return NULL if the CDN container is not enabled
+ if (!isset($this->getCDN()->metadata->Enabled)
+ || $this->getCDN()->metadata->Enabled == 'False'
+ ) {
+ return null;
+ }
+
+ // check to see if it's set
+ if (isset($this->getCDN()->metadata->$property)) {
+ return trim($this->getCDN()->metadata->$property);
+ } elseif ($property !== null) {
+ return null;
+ }
+
+ // otherwise, return the whole metadata object
+ return $this->getCDN()->metadata;
+ }
+
+ /**
+ * Returns the CDN container URI prefix
+ *
+ * @api
+ * @return string
+ */
+ public function CDNURI()
+ {
+ return $this->CDNinfo('Uri');
+ }
+
+ /**
+ * Returns the SSL URI for the container
+ *
+ * @api
+ * @return string
+ */
+ public function SSLURI()
+ {
+ return $this->CDNinfo('Ssl-Uri');
+ }
+
+ /**
+ * Returns the streaming URI for the container
+ *
+ * @api
+ * @return string
+ */
+ public function streamingURI()
+ {
+ return $this->CDNinfo('Streaming-Uri');
+ }
+
+ /**
+ * Returns the IOS streaming URI for the container
+ *
+ * @api
+ * @link http://docs.rackspace.com/files/api/v1/cf-devguide/content/iOS-Streaming-d1f3725.html
+ * @return string
+ */
+ public function iosStreamingURI()
+ {
+ return $this->CDNinfo('Ios-Uri');
+ }
+
+ /**
+ * Creates a Collection of objects in the container
+ *
+ * @param array $params associative array of parameter values.
+ * * account/tenant - The unique identifier of the account/tenant.
+ * * container- The unique identifier of the container.
+ * * limit (Optional) - The number limit of results.
+ * * marker (Optional) - Value of the marker, that the object names
+ * greater in value than are returned.
+ * * end_marker (Optional) - Value of the marker, that the object names
+ * less in value than are returned.
+ * * prefix (Optional) - Value of the prefix, which the returned object
+ * names begin with.
+ * * format (Optional) - Value of the serialized response format, either
+ * json or xml.
+ * * delimiter (Optional) - Value of the delimiter, that all the object
+ * names nested in the container are returned.
+ * @link http://api.openstack.org for a list of possible parameter
+ * names and values
+ * @return OpenCloud\Collection
+ * @throws ObjFetchError
+ */
+ public function objectList($params = array())
+ {
+ // construct a query string out of the parameters
+ $params['format'] = 'json';
+
+ $queryString = $this->makeQueryString($params);
+
+ // append the query string to the URL
+ $url = $this->url();
+ if (strlen($queryString) > 0) {
+ $url .= '?' . $queryString;
+ }
+
+ return $this->getService()->collection(
+ 'OpenCloud\ObjectStore\Resource\DataObject', $url, $this
+ );
+ }
+
+ /**
+ * Returns a new DataObject associated with this container
+ *
+ * @param string $name if supplied, the name of the object to return
+ * @return DataObject
+ */
+ public function dataObject($name = null)
+ {
+ return new DataObject($this, $name);
+ }
+
+ /**
+ * Refreshes, then associates the CDN container
+ */
+ public function refresh($id = null, $url = null)
+ {
+ parent::refresh($id, $url);
+
+ // @codeCoverageIgnoreStart
+ if ($this->getService() instanceof CDNService) {
+ return;
+ }
+
+
+ if (null !== ($cdn = $this->getService()->CDN())) {
+ try {
+ $this->cdn = new CDNContainer(
+ $cdn,
+ $this->name
+ );
+ } catch (Exceptions\ContainerNotFoundError $e) {
+ $this->cdn = new CDNContainer($cdn);
+ $this->cdn->name = $this->name;
+ }
+ }
+ // @codeCoverageIgnoreEnd
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/DataObject.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/DataObject.php
new file mode 100644
index 0000000000000000000000000000000000000000..443df1f651fcd58e9655b8618455706e8ee23fad
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Resource/DataObject.php
@@ -0,0 +1,941 @@
+<?php
+/**
+ * PHP OpenCloud library.
+ *
+ * @copyright Copyright 2013 Rackspace US, Inc. See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.6.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\ObjectStore\Resource;
+
+use finfo as FileInfo;
+use OpenCloud\Common\Lang;
+use OpenCloud\Common\Exceptions;
+use OpenCloud\ObjectStore\AbstractService;
+use OpenCloud\Common\Request\Response\Http;
+
+/**
+ * Objects are the basic storage entities in Cloud Files. They represent the
+ * files and their optional metadata you upload to the system. When you upload
+ * objects to Cloud Files, the data is stored as-is (without compression or
+ * encryption) and consists of a location (container), the object's name, and
+ * any metadata you assign consisting of key/value pairs.
+ */
+class DataObject extends AbstractStorageObject
+{
+ /**
+ * Object name. The only restriction on object names is that they must be
+ * less than 1024 bytes in length after URL encoding.
+ *
+ * @var string
+ */
+ public $name;
+
+ /**
+ * Hash value of the object.
+ *
+ * @var string
+ */
+ public $hash;
+
+ /**
+ * Size of object in bytes.
+ *
+ * @var string
+ */
+ public $bytes;
+
+ /**
+ * Date of last modification.
+ *
+ * @var string
+ */
+ public $last_modified;
+
+ /**
+ * Object's content type.
+ *
+ * @var string
+ */
+ public $content_type;
+
+ /**
+ * Object's content length.
+ *
+ * @var string
+ */
+ public $content_length;
+
+ /**
+ * Other headers set for this object (e.g. Access-Control-Allow-Origin)
+ *
+ * @var array
+ */
+ public $extra_headers = array();
+
+ /**
+ * Whether or not to calculate and send an ETag on create.
+ *
+ * @var bool
+ */
+ public $send_etag = true;
+
+ /**
+ * The data contained by the object.
+ *
+ * @var string
+ */
+ private $data;
+
+ /**
+ * The ETag value.
+ *
+ * @var string
+ */
+ private $etag;
+
+ /**
+ * The parent container of this object.
+ *
+ * @var CDNContainer
+ */
+ private $container;
+
+ /**
+ * Is this data object a pseudo directory?
+ *
+ * @var bool
+ */
+ private $directory = false;
+
+ /**
+ * Used to translate header values (returned by requests) into properties.
+ *
+ * @var array
+ */
+ private $headerTranslate = array(
+ 'Etag' => 'hash',
+ 'ETag' => 'hash',
+ 'Last-Modified' => 'last_modified',
+ 'Content-Length' => array('bytes', 'content_length'),
+ );
+
+ /**
+ * These properties can be freely set by the user for CRUD operations.
+ *
+ * @var array
+ */
+ private $allowedProperties = array(
+ 'name',
+ 'content_type',
+ 'extra_headers',
+ 'send_etag'
+ );
+
+ /**
+ * Option for clearing the status cache when objects are uploaded to API.
+ * By default, it is set to FALSE for performance; but if you have files
+ * that are rapidly and very often updated, you might want to clear the status
+ * cache so PHP reads the files directly, instead of relying on the cache.
+ *
+ * @link http://php.net/manual/en/function.clearstatcache.php
+ * @var bool
+ */
+ public $clearStatusCache = false;
+
+ /**
+ * A DataObject is related to a container and has a name
+ *
+ * If `$name` is specified, then it attempts to retrieve the object from the
+ * object store.
+ *
+ * @param Container $container the container holding this object
+ * @param mixed $cdata if an object or array, it is treated as values
+ * with which to populate the object. If it is a string, it is
+ * treated as a name and the object's info is retrieved from
+ * the service.
+ * @return void
+ */
+ public function __construct($container, $cdata = null)
+ {
+ parent::__construct();
+
+ $this->container = $container;
+
+ // For pseudo-directories, we need to ensure the name is set
+ if (!empty($cdata->subdir)) {
+ $this->name = $cdata->subdir;
+ $this->directory = true;
+ } else {
+ $this->populate($cdata);
+ }
+ }
+
+ /**
+ * Is this data object a pseudo-directory?
+ *
+ * @return bool
+ */
+ public function isDirectory()
+ {
+ return $this->directory;
+ }
+
+ /**
+ * Allow other objects to know what the primary key is.
+ *
+ * @return string
+ */
+ public function primaryKeyField()
+ {
+ return 'name';
+ }
+
+ /**
+ * Is this a real file?
+ *
+ * @param string $filename
+ * @return bool
+ */
+ private function isRealFile($filename)
+ {
+ return $filename != '/dev/null' && $filename != 'NUL';
+ }
+
+ /**
+ * Set this file's content type.
+ *
+ * @param string $contentType
+ */
+ public function setContentType($contentType)
+ {
+ $this->content_type = $contentType;
+ }
+
+ /**
+ * Return the content type.
+ *
+ * @return string
+ */
+ public function getContentType()
+ {
+ return $this->content_type;
+ }
+
+ /**
+ * Returns the URL of the data object
+ *
+ * If the object is new and doesn't have a name, then an exception is
+ * thrown.
+ *
+ * @param string $subresource Not used
+ * @return string
+ * @throws NoNameError
+ */
+ public function url($subresource = '')
+ {
+ if (!$this->name) {
+ throw new Exceptions\NoNameError(Lang::translate('Object has no name'));
+ }
+
+ return Lang::noslash(
+ $this->container->url()) . '/' . str_replace('%2F', '/', rawurlencode($this->name)
+ );
+ }
+
+ /**
+ * Creates (or updates; both the same) an instance of the object
+ *
+ * @api
+ * @param array $params an optional associative array that can contain the
+ * 'name' and 'content_type' of the object
+ * @param string $filename if provided, then the object is loaded from the
+ * specified file
+ * @return boolean
+ * @throws CreateUpdateError
+ */
+ public function create($params = array(), $filename = null, $extractArchive = null)
+ {
+ // Set and validate params
+ $this->setParams($params);
+
+ // assume no file upload
+ $fp = false;
+
+ // if the filename is provided, process it
+ if ($filename) {
+
+ if (!$fp = @fopen($filename, 'r')) {
+ throw new Exceptions\IOError(sprintf(
+ Lang::translate('Could not open file [%s] for reading'),
+ $filename
+ ));
+ }
+
+ // @todo Maybe, for performance, we could set the "clear status cache"
+ // feature to false by default - but allow users to set to true if required
+ clearstatcache($this->clearStatusCache === true, $filename);
+
+ // Cast filesize as a floating point
+ $filesize = (float) filesize($filename);
+
+ // Check it's below a reasonable size, and set
+ // @codeCoverageIgnoreStart
+ if ($filesize > AbstractService::MAX_OBJECT_SIZE) {
+ throw new Exceptions\ObjectError("File size exceeds maximum object size.");
+ }
+ // @codeCoverageIgnoreEnd
+ $this->content_length = $filesize;
+
+ // Guess the content type if necessary
+ if (!$this->getContentType() && $this->isRealFile($filename)) {
+ $this->setContentType($this->inferContentType($filename));
+ }
+
+ // Send ETag checksum if necessary
+ if ($this->send_etag) {
+ $this->etag = md5_file($filename);
+ }
+
+ // Announce to the world
+ $this->getLogger()->info('Uploading {size} bytes from {name}', array(
+ 'size' => $filesize,
+ 'name' => $filename
+ ));
+
+ } else {
+ // compute the length
+ $this->content_length = strlen($this->data);
+
+ if ($this->send_etag) {
+ $this->etag = md5($this->data);
+ }
+ }
+
+ // Only allow supported archive types
+ // http://docs.rackspace.com/files/api/v1/cf-devguide/content/Extract_Archive-d1e2338.html
+ $extractArchiveUrlArg = '';
+
+ if ($extractArchive) {
+ if ($extractArchive !== "tar.gz" && $extractArchive !== "tar.bz2") {
+ throw new Exceptions\ObjectError(
+ "Extract Archive only supports tar.gz and tar.bz2"
+ );
+ } else {
+ $extractArchiveUrlArg = "?extract-archive=" . $extractArchive;
+ $this->etag = null;
+ $this->setContentType('');
+ }
+ }
+
+ // Set headers
+ $headers = $this->metadataHeaders();
+
+ if (!empty($this->etag)) {
+ $headers['ETag'] = $this->etag;
+ }
+
+ // Content-Type is no longer required; if not specified, it will
+ // attempt to guess based on the file extension.
+ if (!$this->getContentType()) {
+ $headers['Content-Type'] = $this->getContentType();
+ }
+
+ $headers['Content-Length'] = $this->content_length;
+
+ // Merge in extra headers
+ if (!empty($this->extra_headers)) {
+ $headers = $this->extra_headers + $headers;
+ }
+
+ // perform the request
+ $response = $this->getService()->request(
+ $this->url() . $extractArchiveUrlArg,
+ 'PUT',
+ $headers,
+ $fp ? $fp : $this->data
+ );
+
+ // check the status
+ // @codeCoverageIgnoreStart
+ if (($status = $response->httpStatus()) >= 300) {
+ throw new Exceptions\CreateUpdateError(sprintf(
+ Lang::translate('Problem saving/updating object [%s] HTTP status [%s] response [%s]'),
+ $this->url() . $extractArchiveUrlArg,
+ $status,
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ // set values from response
+ $this->saveResponseHeaders($response);
+
+ // close the file handle
+ if ($fp) {
+ fclose($fp);
+ }
+
+ return $response;
+ }
+
+ /**
+ * Update() is provided as an alias for the Create() method
+ *
+ * Since update and create both use a PUT request, the different functions
+ * may allow the developer to distinguish between the semantics in his or
+ * her application.
+ *
+ * @api
+ * @param array $params an optional associative array that can contain the
+ * 'name' and 'type' of the object
+ * @param string $filename if provided, the object is loaded from the file
+ * @return boolean
+ */
+ public function update($params = array(), $filename = '')
+ {
+ return $this->create($params, $filename);
+ }
+
+ /**
+ * UpdateMetadata() - updates headers
+ *
+ * Updates metadata headers
+ *
+ * @api
+ * @param array $params an optional associative array that can contain the
+ * 'name' and 'type' of the object
+ * @return boolean
+ */
+ public function updateMetadata($params = array())
+ {
+ $this->setParams($params);
+
+ // set the headers
+ $headers = $this->metadataHeaders();
+ $headers['Content-Type'] = $this->getContentType();
+
+ $response = $this->getService()->request(
+ $this->url(),
+ 'POST',
+ $headers
+ );
+
+ // check the status
+ // @codeCoverageIgnoreStart
+ if (($stat = $response->httpStatus()) >= 204) {
+ throw new Exceptions\UpdateError(sprintf(
+ Lang::translate('Problem updating object [%s] HTTP status [%s] response [%s]'),
+ $this->url(),
+ $stat,
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return $response;
+ }
+
+ /**
+ * Deletes an object from the Object Store
+ *
+ * Note that we can delete without retrieving by specifying the name in the
+ * parameter array.
+ *
+ * @api
+ * @param array $params an array of parameters
+ * @return HttpResponse if successful; FALSE if not
+ * @throws DeleteError
+ */
+ public function delete($params = array())
+ {
+ $this->setParams($params);
+
+ $response = $this->getService()->request($this->url(), 'DELETE');
+
+ // check the status
+ // @codeCoverageIgnoreStart
+ if (($stat = $response->httpStatus()) >= 300) {
+ throw new Exceptions\DeleteError(sprintf(
+ Lang::translate('Problem deleting object [%s] HTTP status [%s] response [%s]'),
+ $this->url(),
+ $stat,
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return $response;
+ }
+
+ /**
+ * Copies the object to another container/object
+ *
+ * Note that this function, because it operates within the Object Store
+ * itself, is much faster than downloading the object and re-uploading it
+ * to a new object.
+ *
+ * @param DataObject $target the target of the COPY command
+ */
+ public function copy(DataObject $target)
+ {
+ $uri = sprintf('/%s/%s', $target->container()->name(), $target->name());
+
+ $this->getLogger()->info('Copying object to [{uri}]', array('uri' => $uri));
+
+ $response = $this->getService()->request(
+ $this->url(),
+ 'COPY',
+ array('Destination' => $uri)
+ );
+
+ // check response code
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() > 202) {
+ throw new Exceptions\ObjectCopyError(sprintf(
+ Lang::translate('Error copying object [%s], status [%d] response [%s]'),
+ $this->url(),
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return $response;
+ }
+
+ /**
+ * Returns the container of the object
+ *
+ * @return Container
+ */
+ public function container()
+ {
+ return $this->container;
+ }
+
+ /**
+ * returns the TEMP_URL for the object
+ *
+ * Some notes:
+ * * The `$secret` value is arbitrary; it must match the value set for
+ * the `X-Account-Meta-Temp-URL-Key` on the account level. This can be
+ * set by calling `$service->SetTempUrlSecret($secret)`.
+ * * The `$expires` value is the number of seconds you want the temporary
+ * URL to be valid for. For example, use `60` to make it valid for a
+ * minute
+ * * The `$method` must be either GET or PUT. No other methods are
+ * supported.
+ *
+ * @param string $secret the shared secret
+ * @param integer $expires the expiration time (in seconds)
+ * @param string $method either GET or PUT
+ * @return string the temporary URL
+ */
+ public function tempUrl($secret, $expires, $method)
+ {
+ $method = strtoupper($method);
+ $expiry_time = time() + $expires;
+
+ // check for proper method
+ if ($method != 'GET' && $method != 'PUT') {
+ throw new Exceptions\TempUrlMethodError(sprintf(
+ Lang::translate(
+ 'Bad method [%s] for TempUrl; only GET or PUT supported'),
+ $method
+ ));
+ }
+
+ // construct the URL
+ $url = $this->url();
+ $path = urldecode(parse_url($url, PHP_URL_PATH));
+
+ $hmac_body = "$method\n$expiry_time\n$path";
+ $hash = hash_hmac('sha1', $hmac_body, $secret);
+
+ $this->getLogger()->info('URL [{url}]; SIG [{sig}]; HASH [{hash}]', array(
+ 'url' => $url,
+ 'sig' => $hmac_body,
+ 'hash' => $hash
+ ));
+
+ $temp_url = sprintf('%s?temp_url_sig=%s&temp_url_expires=%d', $url, $hash, $expiry_time);
+
+ // debug that stuff
+ $this->getLogger()->info('TempUrl generated [{url}]', array(
+ 'url' => $temp_url
+ ));
+
+ return $temp_url;
+ }
+
+ /**
+ * Sets object data from string
+ *
+ * This is a convenience function to permit the use of other technologies
+ * for setting an object's content.
+ *
+ * @param string $data
+ * @return void
+ */
+ public function setData($data)
+ {
+ $this->data = (string) $data;
+ }
+
+ /**
+ * Return object's data as a string
+ *
+ * @return string the entire object
+ */
+ public function saveToString()
+ {
+ return $this->getService()->request($this->url())->httpBody();
+ }
+
+ /**
+ * Saves the object's data to local filename
+ *
+ * Given a local filename, the Object's data will be written to the newly
+ * created file.
+ *
+ * Example:
+ * <code>
+ * # ... authentication/connection/container code excluded
+ * # ... see previous examples
+ *
+ * # Whoops! I deleted my local README, let me download/save it
+ * #
+ * $my_docs = $conn->get_container("documents");
+ * $doc = $my_docs->get_object("README");
+ *
+ * $doc->SaveToFilename("/home/ej/cloudfiles/readme.restored");
+ * </code>
+ *
+ * @param string $filename name of local file to write data to
+ * @return boolean <kbd>TRUE</kbd> if successful
+ * @throws IOException error opening file
+ * @throws InvalidResponseException unexpected response
+ */
+ public function saveToFilename($filename)
+ {
+ if (!$fp = @fopen($filename, "wb")) {
+ throw new Exceptions\IOError(sprintf(
+ Lang::translate('Could not open file [%s] for writing'),
+ $filename
+ ));
+ }
+
+ $result = $this->getService()->request($this->url(), 'GET', array(), $fp);
+
+ fclose($fp);
+
+ return $result;
+ }
+
+ /**
+ * Saves the object's to a stream filename
+ *
+ * Given a local filename, the Object's data will be written to the stream
+ *
+ * Example:
+ * <code>
+ * # ... authentication/connection/container code excluded
+ * # ... see previous examples
+ *
+ * # If I want to write the README to a temporary memory string I
+ * # do :
+ * #
+ * $my_docs = $conn->get_container("documents");
+ * $doc = $my_docs->DataObject(array("name"=>"README"));
+ *
+ * $fp = fopen('php://temp', 'r+');
+ * $doc->SaveToStream($fp);
+ * fclose($fp);
+ * </code>
+ *
+ * @param string $filename name of local file to write data to
+ * @return boolean <kbd>TRUE</kbd> if successful
+ * @throws IOException error opening file
+ * @throws InvalidResponseException unexpected response
+ */
+ public function saveToStream($resource)
+ {
+ if (!is_resource($resource)) {
+ throw new Exceptions\ObjectError(
+ Lang::translate("Resource argument not a valid PHP resource."
+ ));
+ }
+
+ return $this->getService()->request($this->url(), 'GET', array(), $resource);
+ }
+
+
+ /**
+ * Returns the object's MD5 checksum
+ *
+ * Accessor method for reading Object's private ETag attribute.
+ *
+ * @api
+ * @return string MD5 checksum hexidecimal string
+ */
+ public function getETag()
+ {
+ return $this->etag;
+ }
+
+ /**
+ * Purges the object from the CDN
+ *
+ * Note that the object will still be served up to the time of its
+ * TTL value.
+ *
+ * @api
+ * @param string $email An email address that will be notified when
+ * the object is purged.
+ * @return void
+ * @throws CdnError if the container is not CDN-enabled
+ * @throws CdnHttpError if there is an HTTP error in the transaction
+ */
+ public function purgeCDN($email)
+ {
+ // @codeCoverageIgnoreStart
+ if (!$cdn = $this->Container()->CDNURL()) {
+ throw new Exceptions\CdnError(Lang::translate('Container is not CDN-enabled'));
+ }
+ // @codeCoverageIgnoreEnd
+
+ $url = $cdn . '/' . $this->name;
+ $headers['X-Purge-Email'] = $email;
+ $response = $this->getService()->request($url, 'DELETE', $headers);
+
+ // check the status
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() > 204) {
+ throw new Exceptions\CdnHttpError(sprintf(
+ Lang::translate('Error purging object, status [%d] response [%s]'),
+ $response->httpStatus(),
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return true;
+ }
+
+ /**
+ * Returns the CDN URL (for managing the object)
+ *
+ * Note that the DataObject::PublicURL() method is used to return the
+ * publicly-available URL of the object, while the CDNURL() is used
+ * to manage the object.
+ *
+ * @return string
+ */
+ public function CDNURL()
+ {
+ return $this->container()->CDNURL() . '/' . $this->name;
+ }
+
+ /**
+ * Returns the object's Public CDN URL, if available
+ *
+ * @api
+ * @param string $type can be 'streaming', 'ssl', 'ios-streaming',
+ * or anything else for the
+ * default URL. For example, `$object->PublicURL('ios-streaming')`
+ * @return string
+ */
+ public function publicURL($type = null)
+ {
+ if (!$prefix = $this->container()->CDNURI()) {
+ return null;
+ }
+
+ switch(strtoupper($type)) {
+ case 'SSL':
+ $url = $this->container()->SSLURI().'/'.$this->name;
+ break;
+ case 'STREAMING':
+ $url = $this->container()->streamingURI().'/'.$this->name;
+ break;
+ case 'IOS':
+ case 'IOS-STREAMING':
+ $url = $this->container()->iosStreamingURI().'/'.$this->name;
+ break;
+ default:
+ $url = $prefix.'/'.$this->name;
+ break;
+ }
+
+ return $url;
+ }
+
+ /**
+ * Sets parameters from an array and validates them.
+ *
+ * @param array $params Associative array of parameters
+ * @return void
+ */
+ private function setParams(array $params = array())
+ {
+ // Inspect the user's array for any unapproved keys, and unset if necessary
+ foreach (array_diff(array_keys($params), $this->allowedProperties) as $key) {
+ $this->getLogger()->warning('You cannot use the {keyName} key when creating an object', array(
+ 'keyName' => $key
+ ));
+ unset($params[$key]);
+ }
+
+ $this->populate($params);
+ }
+
+ /**
+ * Retrieves a single object, parses headers
+ *
+ * @return void
+ * @throws NoNameError, ObjFetchError
+ */
+ private function fetch()
+ {
+ if (!$this->name) {
+ throw new Exceptions\NoNameError(Lang::translate('Cannot retrieve an unnamed object'));
+ }
+
+ $response = $this->getService()->request($this->url(), 'HEAD', array('Accept' => '*/*'));
+
+ // check for errors
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() >= 300) {
+ throw new Exceptions\ObjFetchError(sprintf(
+ Lang::translate('Problem retrieving object [%s]'),
+ $this->url()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ // set headers as metadata?
+ $this->saveResponseHeaders($response);
+
+ // parse the metadata
+ $this->getMetadata($response);
+ }
+
+ /**
+ * Extracts the headers from the response, and saves them as object
+ * attributes. Additional name conversions are done where necessary.
+ *
+ * @param Http $response
+ */
+ private function saveResponseHeaders(Http $response, $fillExtraIfNotFound = true)
+ {
+ foreach ($response->headers() as $header => $value) {
+ if (isset($this->headerTranslate[$header])) {
+ // This header needs to be translated
+ $property = $this->headerTranslate[$header];
+ // Are there multiple properties that need to be set?
+ if (is_array($property)) {
+ foreach ($property as $subProperty) {
+ $this->$subProperty = $value;
+ }
+ } else {
+ $this->$property = $value;
+ }
+ } elseif ($fillExtraIfNotFound === true) {
+ // Otherwise, stock extra headers
+ $this->extra_headers[$header] = $value;
+ }
+ }
+ }
+
+ /**
+ * Compatability.
+ */
+ public function refresh()
+ {
+ return $this->fetch();
+ }
+
+ /**
+ * Returns the service associated with this object
+ *
+ * It's actually the object's container's service, so this method will
+ * simplify things a bit.
+ */
+ private function getService()
+ {
+ return $this->container->getService();
+ }
+
+ /**
+ * Performs an internal check to get the proper MIME type for an object
+ *
+ * This function would go over the available PHP methods to get
+ * the MIME type.
+ *
+ * By default it will try to use the PHP fileinfo library which is
+ * available from PHP 5.3 or as an PECL extension
+ * (http://pecl.php.net/package/Fileinfo).
+ *
+ * It will get the magic file by default from the system wide file
+ * which is usually available in /usr/share/magic on Unix or try
+ * to use the file specified in the source directory of the API
+ * (share directory).
+ *
+ * if fileinfo is not available it will try to use the internal
+ * mime_content_type function.
+ *
+ * @param string $handle name of file or buffer to guess the type from
+ * @return boolean <kbd>TRUE</kbd> if successful
+ * @throws BadContentTypeException
+ * @codeCoverageIgnore
+ */
+ private function inferContentType($handle)
+ {
+ if ($contentType = $this->getContentType()) {
+ return $contentType;
+ }
+
+ $contentType = false;
+
+ $filePath = (is_string($handle)) ? $handle : (string) $handle;
+
+ if (function_exists("finfo_open")) {
+
+ $magicPath = dirname(__FILE__) . "/share/magic";
+ $finfo = new FileInfo(FILEINFO_MIME, file_exists($magicPath) ? $magicPath : null);
+
+ if ($finfo) {
+
+ $contentType = is_file($filePath)
+ ? $finfo->file($handle)
+ : $finfo->buffer($handle);
+
+ /**
+ * PHP 5.3 fileinfo display extra information like charset so we
+ * remove everything after the ; since we are not into that stuff
+ */
+ if (null !== ($extraInfo = strpos($contentType, "; "))) {
+ $contentType = substr($contentType, 0, $extraInfo);
+ }
+ }
+
+ //unset($finfo);
+ }
+
+ if (!$contentType) {
+ // Try different native function instead
+ if (is_file((string) $handle) && function_exists("mime_content_type")) {
+ $contentType = mime_content_type($handle);
+ } else {
+ $this->getLogger()->error('Content-Type cannot be found');
+ }
+ }
+
+ return $contentType;
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Service.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Service.php
new file mode 100644
index 0000000000000000000000000000000000000000..571b33378ace1a025f8cf7e66dc1ce0d780676ad
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/ObjectStore/Service.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * PHP OpenCloud library.
+ *
+ * @copyright Copyright 2013 Rackspace US, Inc. See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.6.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud\ObjectStore;
+
+use OpenCloud\OpenStack;
+use OpenCloud\Common\Exceptions;
+use OpenCloud\Common\Lang;
+
+/**
+ * The ObjectStore (Cloud Files) service.
+ */
+class Service extends AbstractService
+{
+
+ /**
+ * This holds the associated CDN service (for Rackspace public cloud)
+ * or is NULL otherwise. The existence of an object here is
+ * indicative that the CDN service is available.
+ */
+ private $cdn;
+
+ /**
+ * Creates a new ObjectStore service object.
+ *
+ * @param OpenCloud\OpenStack $connection The connection object
+ * @param string $serviceName The name of the service
+ * @param string $serviceRegion The service's region
+ * @param string $urlType The type of URL (normally 'publicURL')
+ */
+ public function __construct(
+ OpenStack $connection,
+ $serviceName = RAXSDK_OBJSTORE_NAME,
+ $serviceRegion = RAXSDK_OBJSTORE_REGION,
+ $urltype = RAXSDK_OBJSTORE_URLTYPE
+ ) {
+ $this->getLogger()->info('Initializing Container Service...');
+
+ parent::__construct(
+ $connection,
+ 'object-store',
+ $serviceName,
+ $serviceRegion,
+ $urltype
+ );
+
+ // establish the CDN container, if available
+ try {
+ $this->cdn = new CDNService(
+ $connection,
+ $serviceName . 'CDN',
+ $serviceRegion,
+ $urltype
+ );
+ } catch (Exceptions\EndpointError $e) {
+ // If we have an endpoint error, then the CDN functionality is not
+ // available. In this case, we silently ignore it.
+ }
+ }
+
+ /**
+ * Sets the shared secret value for the TEMP_URL
+ *
+ * @param string $secret the shared secret
+ * @return HttpResponse
+ */
+ public function setTempUrlSecret($secret)
+ {
+ $response = $this->request(
+ $this->url(),
+ 'POST',
+ array('X-Account-Meta-Temp-Url-Key' => $secret)
+ );
+
+ // @codeCoverageIgnoreStart
+ if ($response->httpStatus() > 204) {
+ throw new Exceptions\HttpError(sprintf(
+ Lang::translate('Error in request, status [%d] for URL [%s] [%s]'),
+ $response->httpStatus(),
+ $this->url(),
+ $response->httpBody()
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ return $response;
+ }
+
+ /**
+ * Get the CDN service.
+ *
+ * @return null|CDNService
+ */
+ public function getCDNService()
+ {
+ return $this->cdn;
+ }
+
+ /**
+ * Backwards compability.
+ */
+ public function CDN()
+ {
+ return $this->getCDNService();
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/OpenStack.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/OpenStack.php
new file mode 100644
index 0000000000000000000000000000000000000000..c3e645a540687e58d0d4e6e6a600b9ee6e6a7f1f
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/OpenStack.php
@@ -0,0 +1,1198 @@
+<?php
+/**
+ * PHP OpenCloud library.
+ *
+ * @copyright Copyright 2013 Rackspace US, Inc. See COPYING for licensing information.
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
+ * @version 1.6.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ * @author Jamie Hannaford <jamie.hannaford@rackspace.com>
+ */
+
+namespace OpenCloud;
+
+require_once __DIR__ . '/Globals.php';
+
+use OpenCloud\Common\Base;
+use OpenCloud\Common\Lang;
+use OpenCloud\Common\Exceptions;
+use OpenCloud\Common\ServiceCatalogItem;
+
+/**
+ * The OpenStack class represents a relationship (or "connection")
+ * between a user and a service.
+ *
+ * This is the primary entry point into an OpenStack system, and the only one
+ * where the developer is required to know and provide the endpoint URL (in
+ * all other cases, the endpoint is derived from the Service Catalog provided
+ * by the authentication system).
+ *
+ * Since various providers have different mechanisms for authentication, users
+ * will often use a subclass of OpenStack. For example, the Rackspace
+ * class is provided for users of Rackspace's cloud services, and other cloud
+ * providers are welcome to add their own subclasses as well.
+ *
+ * General usage example:
+ * <code>
+ * $username = 'My Username';
+ * $secret = 'My Secret';
+ * $connection = new OpenCloud\OpenStack($username, $secret);
+ * // having established the connection, we can set some defaults
+ * // this sets the default name and region of the Compute service
+ * $connection->SetDefaults('Compute', 'cloudServersOpenStack', 'ORD');
+ * // access a Compute service
+ * $chicago = $connection->Compute();
+ * // if we want to access a different service, we can:
+ * $dallas = $connection->Compute('cloudServersOpenStack', 'DFW');
+ * </code>
+ */
+class OpenStack extends Base
+{
+
+ /**
+ * This holds the HTTP User-Agent: used for all requests to the services. It
+ * is public so that, if necessary, it can be entirely overridden by the
+ * developer. However, it's strongly recomended that you use the
+ * appendUserAgent() method to APPEND your own User Agent identifier to the
+ * end of this string; the user agent information can be very valuable to
+ * service providers to track who is using their service.
+ *
+ * @var string
+ */
+ public $useragent = RAXSDK_USER_AGENT;
+
+ protected $url;
+ protected $secret = array();
+ protected $token;
+ protected $expiration = 0;
+ protected $tenant;
+ protected $catalog;
+ protected $connectTimeout = RAXSDK_CONNECTTIMEOUT;
+ protected $httpTimeout = RAXSDK_TIMEOUT;
+ protected $overlimitTimeout = RAXSDK_OVERLIMIT_TIMEOUT;
+
+ /**
+ * This associative array holds default values used to identify each
+ * service (and to select it from the Service Catalog). Use the
+ * Compute::SetDefaults() method to change the default values, or
+ * define the global constants (for example, RAXSDK_COMPUTE_NAME)
+ * BEFORE loading the OpenCloud library:
+ *
+ * <code>
+ * define('RAXSDK_COMPUTE_NAME', 'cloudServersOpenStack');
+ * include('openstack.php');
+ * </code>
+ */
+ protected $defaults = array(
+ 'Compute' => array(
+ 'name' => RAXSDK_COMPUTE_NAME,
+ 'region' => RAXSDK_COMPUTE_REGION,
+ 'urltype' => RAXSDK_COMPUTE_URLTYPE
+ ),
+ 'ObjectStore' => array(
+ 'name' => RAXSDK_OBJSTORE_NAME,
+ 'region' => RAXSDK_OBJSTORE_REGION,
+ 'urltype' => RAXSDK_OBJSTORE_URLTYPE
+ ),
+ 'Database' => array(
+ 'name' => RAXSDK_DATABASE_NAME,
+ 'region' => RAXSDK_DATABASE_REGION,
+ 'urltype' => RAXSDK_DATABASE_URLTYPE
+ ),
+ 'Volume' => array(
+ 'name' => RAXSDK_VOLUME_NAME,
+ 'region' => RAXSDK_VOLUME_REGION,
+ 'urltype' => RAXSDK_VOLUME_URLTYPE
+ ),
+ 'LoadBalancer' => array(
+ 'name' => RAXSDK_LBSERVICE_NAME,
+ 'region' => RAXSDK_LBSERVICE_REGION,
+ 'urltype' => RAXSDK_LBSERVICE_URLTYPE
+ ),
+ 'DNS' => array(
+ 'name' => RAXSDK_DNS_NAME,
+ 'region' => RAXSDK_DNS_REGION,
+ 'urltype' => RAXSDK_DNS_URLTYPE
+ ),
+ 'Orchestration' => array(
+ 'name' => RAXSDK_ORCHESTRATION_NAME,
+ 'region' => RAXSDK_ORCHESTRATION_REGION,
+ 'urltype' => RAXSDK_ORCHESTRATION_URLTYPE
+ ),
+ 'CloudMonitoring' => array(
+ 'name' => RAXSDK_MONITORING_NAME,
+ 'region' => RAXSDK_MONITORING_REGION,
+ 'urltype' => RAXSDK_MONITORING_URLTYPE
+ ),
+ 'Autoscale' => array(
+ 'name' => RAXSDK_AUTOSCALE_NAME,
+ 'region' => RAXSDK_AUTOSCALE_REGION,
+ 'urltype' => RAXSDK_AUTOSCALE_URLTYPE
+ )
+ );
+
+ private $_user_write_progress_callback_func;
+ private $_user_read_progress_callback_func;
+
+ /**
+ * Tracks file descriptors used by streaming downloads
+ *
+ * This will permit multiple simultaneous streaming downloads; the
+ * key is the URL of the object, and the value is its file descriptor.
+ *
+ * To prevent memory overflows, each array element is deleted when
+ * the end of the file is reached.
+ */
+ private $fileDescriptors = array();
+
+ /**
+ * array of options to pass to the CURL request object
+ */
+ private $curlOptions = array();
+
+ /**
+ * list of attributes to export/import
+ */
+ private $exportItems = array(
+ 'token',
+ 'expiration',
+ 'tenant',
+ 'catalog'
+ );
+
+ /**
+ * Creates a new OpenStack object
+ *
+ * The OpenStack object needs two bits of information: the URL to
+ * authenticate against, and a "secret", which is an associative array
+ * of name/value pairs. Usually, the secret will be a username and a
+ * password, but other values may be required by different authentication
+ * systems. For example, OpenStack Keystone requires a username and
+ * password, but Rackspace uses a username, tenant ID, and API key.
+ * (See OpenCloud\Rackspace for that.)
+ *
+ * @param string $url - the authentication endpoint URL
+ * @param array $secret - an associative array of auth information:
+ * * username
+ * * password
+ * @param array $options - CURL options to pass to the HttpRequest object
+ */
+ public function __construct($url, array $secret, array $options = array())
+ {
+ // check for supported version
+ // @codeCoverageIgnoreStart
+ $version = phpversion();
+ if ($version < '5.3.1') {
+ throw new Exceptions\UnsupportedVersionError(sprintf(
+ Lang::translate('PHP version [%s] is not supported'),
+ $version
+ ));
+ }
+ // @codeCoverageIgnoreEnd
+
+ // Start processing
+ $this->getLogger()->info(Lang::translate('Initializing OpenStack client'));
+
+ // Set properties
+ $this->setUrl($url);
+ $this->setSecret($secret);
+ $this->setCurlOptions($options);
+ }
+
+ /**
+ * Set user agent.
+ *
+ * @param string $useragent
+ * @return OpenCloud\OpenStack
+ */
+ public function setUserAgent($useragent)
+ {
+ $this->useragent = $useragent;
+
+ return $this;
+ }
+
+ /**
+ * Allows the user to append a user agent string
+ *
+ * Programs that are using these bindings are encouraged to add their
+ * user agent to the one supplied by this SDK. This will permit cloud
+ * providers to track users so that they can provide better service.
+ *
+ * @param string $agent an arbitrary user-agent string; e.g. "My Cloud App"
+ * @return OpenCloud\OpenStack
+ */
+ public function appendUserAgent($useragent)
+ {
+ $this->useragent .= ';' . $useragent;
+
+ return $this;
+ }
+
+ /**
+ * Get user agent.
+ *
+ * @return string
+ */
+ public function getUserAgent()
+ {
+ return $this->useragent;
+ }
+
+ /**
+ * Sets the URL which the client will access.
+ *
+ * @param string $url
+ * @return OpenCloud\OpenStack
+ */
+ public function setUrl($url)
+ {
+ $this->url = $url;
+
+ return $this;
+ }
+
+ /**
+ * Get the URL.
+ *
+ * @return string
+ */
+ public function getUrl()
+ {
+ return $this->url;
+ }
+
+ /**
+ * Set the secret for the client.
+ *
+ * @param array $secret
+ * @return OpenCloud\OpenStack
+ */
+ public function setSecret(array $secret = array())
+ {
+ $this->secret = $secret;
+
+ return $this;
+ }
+
+ /**
+ * Get the secret.
+ *
+ * @return array
+ */
+ public function getSecret()
+ {
+ return $this->secret;
+ }
+
+ /**
+ * Set the token for this client.
+ *
+ * @param string $token
+ * @return OpenCloud\OpenStack
+ */
+ public function setToken($token)
+ {
+ $this->token = $token;
+
+ return $this;
+ }
+
+ /**
+ * Get the token for this client.
+ *
+ * @return string
+ */
+ public function getToken()
+ {
+ return $this->token;
+ }
+
+ /**
+ * Set the expiration for this token.
+ *
+ * @param int $expiration
+ * @return OpenCloud\OpenStack
+ */
+ public function setExpiration($expiration)
+ {
+ $this->expiration = $expiration;
+
+ return $this;
+ }
+
+ /**
+ * Get the expiration time.
+ *
+ * @return int
+ */
+ public function getExpiration()
+ {
+ return $this->expiration;
+ }
+
+ /**
+ * Set the tenant for this client.
+ *
+ * @param string $tenant
+ * @return OpenCloud\OpenStack
+ */
+ public function setTenant($tenant)
+ {
+ $this->tenant = $tenant;
+
+ return $this;
+ }
+
+ /**
+ * Get the tenant for this client.
+ *
+ * @return string
+ */
+ public function getTenant()
+ {
+ return $this->tenant;
+ }
+
+ /**
+ * Set the service catalog.
+ *
+ * @param mixed $catalog
+ * @return OpenCloud\OpenStack
+ */
+ public function setCatalog($catalog)
+ {
+ $this->catalog = $catalog;
+
+ return $this;
+ }
+
+ /**
+ * Get the service catalog.
+ *
+ * @return array
+ */
+ public function getCatalog()
+ {
+ return $this->catalog;
+ }
+
+ /**
+ * Set (all) the cURL options.
+ *
+ * @param array $options
+ * @return OpenCloud\OpenStack
+ */
+ public function setCurlOptions(array $options)
+ {
+ $this->curlOptions = $options;
+
+ return $this;
+ }
+
+ /**
+ * Get the cURL options.
+ *
+ * @return array
+ */
+ public function getCurlOptions()
+ {
+ return $this->curlOptions;
+ }
+
+ /**
+ * Set a specific file descriptor (associated with a URL)
+ *
+ * @param string $key
+ * @param resource $value
+ * @return OpenCloud\OpenStack
+ */
+ public function setFileDescriptor($key, $value)
+ {
+ $this->descriptors[$key] = $value;
+
+ return $this;
+ }
+
+ /**
+ * Get a specific file descriptor (associated with a URL)
+ *
+ * @param string $key
+ * @return resource|false
+ */
+ public function getFileDescriptor($key)
+ {
+ return (!isset($this->descriptors[$key])) ? false : $this->descriptors[$key];
+ }
+
+ /**
+ * Get the items to be exported.
+ *
+ * @return array
+ */
+ public function getExportItems()
+ {
+ return $this->exportItems;
+ }
+
+ /**
+ * Sets the connect timeout.
+ *
+ * @param int $timeout
+ * @return OpenCloud\OpenStack
+ */
+ public function setConnectTimeout($timeout)
+ {
+ $this->connectTimeout = $timeout;
+
+ return $this;
+ }
+
+ /**
+ * Get the connect timeout.
+ *
+ * @return int
+ */
+ public function getConnectTimeout()
+ {
+ return $this->connectTimeout;
+ }
+
+ /**
+ * Set the HTTP timeout.
+ *
+ * @param int $timeout
+ * @return OpenCloud\OpenStack
+ */
+ public function setHttpTimeout($timeout)
+ {
+ $this->httpTimeout = $timeout;
+
+ return $this;
+ }
+
+ /**
+ * Get the HTTP timeout.
+ *
+ * @return int
+ */
+ public function getHttpTimeout()
+ {
+ return $this->httpTimeout;
+ }
+
+ /**
+ * Set the overlimit timeout.
+ *
+ * @param int $timeout
+ * @return OpenCloud\OpenStack
+ */
+ public function setOverlimitTimeout($timeout)
+ {
+ $this->overlimitTimeout = $timeout;
+
+ return $this;
+ }
+
+ /**
+ * Get the overlimit timeout.
+ *
+ * @return int
+ */
+ public function getOverlimitTimeout()
+ {
+ return $this->overlimitTimeout;
+ }
+
+ /**
+ * Sets default values (an array) for a service. Each array must contain a
+ * "name", "region" and "urltype" key.
+ *
+ * @param string $service
+ * @param array $value
+ * @return OpenCloud\OpenStack
+ */
+ public function setDefault($service, array $value = array())
+ {
+ if (isset($value['name']) && isset($value['region']) && isset($value['urltype'])) {
+ $this->defaults[$service] = $value;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Get a specific default value for a service. If none exist, return FALSE.
+ *
+ * @param string $service
+ * @return array|false
+ */
+ public function getDefault($service)
+ {
+ return (!isset($this->defaults[$service])) ? false : $this->defaults[$service];
+ }
+
+/**
+ * Sets the timeouts for the current connection
+ *
+ * @api
+ * @param integer $t_http the HTTP timeout value (the max period that
+ * the OpenStack object will wait for any HTTP request to complete).
+ * Value is in seconds.
+ * @param integer $t_conn the Connect timeout value (the max period
+ * that the OpenStack object will wait to establish an HTTP
+ * connection). Value is in seconds.
+ * @param integer $t_overlimit the overlimit timeout value (the max period
+ * that the OpenStack object will wait to retry on an overlimit
+ * condition). Value is in seconds.
+ * @return void
+ */
+ public function setTimeouts($httpTimeout, $connectTimeout = null, $overlimitTimeout = null)
+ {
+ $this->setHttpTimeout($httpTimeout);
+
+ if (isset($connectTimeout)) {
+ $this->setConnectTimeout($connectTimeout);
+ }
+
+ if (isset($overlimitTimeout)) {
+ $this->setOverlimitTimeout($overlimitTimeout);
+ }
+ }
+
+ /**
+ * Returns the URL of this object
+ *
+ * @api
+ * @param string $subresource specified subresource
+ * @return string
+ */
+ public function url($subresource='tokens')
+ {
+ return Lang::noslash($this->url) . '/' . $subresource;
+ }
+
+ /**
+ * Returns the stored secret
+ *
+ * @return array
+ */
+ public function secret()
+ {
+ return $this->getSecret();
+ }
+
+ /**
+ * Re-authenticates session if expired.
+ */
+ public function checkExpiration()
+ {
+ if ($this->hasExpired()) {
+ $this->authenticate();
+ }
+ }
+
+ /**
+ * Checks whether token has expired.
+ *
+ * @return bool
+ */
+ public function hasExpired()
+ {
+ return time() > ($this->getExpiration() - RAXSDK_FUDGE);
+ }
+
+ /**
+ * Returns the cached token; if it has expired, then it re-authenticates
+ *
+ * @api
+ * @return string
+ */
+ public function token()
+ {
+ $this->checkExpiration();
+
+ return $this->getToken();
+ }
+
+ /**
+ * Returns the cached expiration time;
+ * if it has expired, then it re-authenticates
+ *
+ * @api
+ * @return string
+ */
+ public function expiration()
+ {
+ $this->checkExpiration();
+
+ return $this->getExpiration();
+ }
+
+ /**
+ * Returns the tenant ID, re-authenticating if necessary
+ *
+ * @api
+ * @return string
+ */
+ public function tenant()
+ {
+ $this->checkExpiration();
+
+ return $this->getTenant();
+ }
+
+ /**
+ * Returns the service catalog object from the auth service
+ *
+ * @return \stdClass
+ */
+ public function serviceCatalog()
+ {
+ $this->checkExpiration();
+
+ return $this->getCatalog();
+ }
+
+ /**
+ * Returns a Collection of objects with information on services
+ *
+ * Note that these are informational (read-only) and are not actually
+ * 'Service'-class objects.
+ */
+ public function serviceList()
+ {
+ return new Common\Collection($this, 'ServiceCatalogItem', $this->serviceCatalog());
+ }
+
+ /**
+ * Creates and returns the formatted credentials to POST to the auth
+ * service.
+ *
+ * @return string
+ */
+ public function credentials()
+ {
+ if (isset($this->secret['username']) && isset($this->secret['password'])) {
+
+ $credentials = array(
+ 'auth' => array(
+ 'passwordCredentials' => array(
+ 'username' => $this->secret['username'],
+ 'password' => $this->secret['password']
+ )
+ )
+ );
+
+ if (isset($this->secret['tenantName'])) {
+ $credentials['auth']['tenantName'] = $this->secret['tenantName'];
+ }
+
+ return json_encode($credentials);
+
+ } else {
+ throw new Exceptions\CredentialError(
+ Lang::translate('Unrecognized credential secret')
+ );
+ }
+ }
+
+ /**
+ * Authenticates using the supplied credentials
+ *
+ * @api
+ * @return void
+ * @throws AuthenticationError
+ */
+ public function authenticate()
+ {
+ // try to auth
+ $response = $this->request(
+ $this->url(),
+ 'POST',
+ array('Content-Type'=>'application/json'),
+ $this->credentials()
+ );
+
+ $json = $response->httpBody();
+
+ // check for errors
+ if ($response->HttpStatus() >= 400) {
+ throw new Exceptions\AuthenticationError(sprintf(
+ Lang::translate('Authentication failure, status [%d], response [%s]'),
+ $response->httpStatus(),
+ $json
+ ));
+ }
+
+ // Decode and check
+ $object = json_decode($json);
+ $this->checkJsonError();
+
+ // Save the token information as well as the ServiceCatalog
+ $this->setToken($object->access->token->id);
+ $this->setExpiration(strtotime($object->access->token->expires));
+ $this->setCatalog($object->access->serviceCatalog);
+
+ /**
+ * In some cases, the tenant name/id is not returned
+ * as part of the auth token, so we check for it before
+ * we set it. This occurs with pure Keystone, but not
+ * with the Rackspace auth.
+ */
+ if (isset($object->access->token->tenant)) {
+ $this->setTenant($object->access->token->tenant->id);
+ }
+ }
+
+ /**
+ * Performs a single HTTP request
+ *
+ * The request() method is one of the most frequently-used in the entire
+ * library. It performs an HTTP request using the specified URL, method,
+ * and with the supplied headers and body. It handles error and
+ * exceptions for the request.
+ *
+ * @api
+ * @param string url - the URL of the request
+ * @param string method - the HTTP method (defaults to GET)
+ * @param array headers - an associative array of headers
+ * @param string data - either a string or a resource (file pointer) to
+ * use as the request body (for PUT or POST)
+ * @return HttpResponse object
+ * @throws HttpOverLimitError, HttpUnauthorizedError, HttpForbiddenError
+ */
+ public function request($url, $method = 'GET', $headers = array(), $data = null)
+ {
+ $this->getLogger()->info('Resource [{url}] method [{method}] body [{body}]', array(
+ 'url' => $url,
+ 'method' => $method,
+ 'data' => $data
+ ));
+
+ // get the request object
+ $http = $this->getHttpRequestObject($url, $method, $this->getCurlOptions());
+
+ // set various options
+ $this->getLogger()->info('Headers: [{headers}]', array(
+ 'headers' => print_r($headers, true)
+ ));
+
+ $http->setheaders($headers);
+ $http->setHttpTimeout($this->getHttpTimeout());
+ $http->setConnectTimeout($this->getConnectTimeout());
+ $http->setOption(CURLOPT_USERAGENT, $this->getUserAgent());
+
+ // data can be either a resource or a string
+ if (is_resource($data)) {
+ // loading from or writing to a file
+ // set the appropriate callback functions
+ switch($method) {
+ // @codeCoverageIgnoreStart
+ case 'GET':
+ // need to save the file descriptor
+ $this->setFileDescriptor($url, $data);
+ // set the CURL options
+ $http->setOption(CURLOPT_FILE, $data);
+ $http->setOption(CURLOPT_WRITEFUNCTION, array($this, '_write_cb'));
+ break;
+ // @codeCoverageIgnoreEnd
+ case 'PUT':
+ case 'POST':
+ // need to save the file descriptor
+ $this->setFileDescriptor($url, $data);
+ if (!isset($headers['Content-Length'])) {
+ throw new Exceptions\HttpError(
+ Lang::translate('The Content-Length: header must be specified for file uploads')
+ );
+ }
+ $http->setOption(CURLOPT_UPLOAD, TRUE);
+ $http->setOption(CURLOPT_INFILE, $data);
+ $http->setOption(CURLOPT_INFILESIZE, $headers['Content-Length']);
+ $http->setOption(CURLOPT_READFUNCTION, array($this, '_read_cb'));
+ break;
+ default:
+ // do nothing
+ break;
+ }
+ } elseif (is_string($data)) {
+ $http->setOption(CURLOPT_POSTFIELDS, $data);
+ } elseif (isset($data)) {
+ throw new Exceptions\HttpError(
+ Lang::translate('Unrecognized data type for PUT/POST body, must be string or resource')
+ );
+ }
+
+ // perform the HTTP request; returns an HttpResult object
+ $response = $http->execute();
+
+ // handle and retry on overlimit errors
+ if ($response->httpStatus() == 413) {
+
+ $object = json_decode($response->httpBody());
+ $this->checkJsonError();
+
+ // @codeCoverageIgnoreStart
+ if (isset($object->overLimit)) {
+ /**
+ * @TODO(glen) - The documentation says "retryAt", but
+ * the field returned is "retryAfter". If the doc changes,
+ * then there's no problem, but we'll need to fix this if
+ * they change the code to match the docs.
+ */
+ $retryAfter = $object->overLimit->retryAfter;
+ $sleepInterval = strtotime($retryAfter) - time();
+
+ if ($sleepInterval && $sleepInterval <= $this->getOverlimitTimeout()) {
+ sleep($sleepInterval);
+ $response = $http->Execute();
+ } else {
+ throw new Exceptions\HttpOverLimitError(sprintf(
+ Lang::translate('Over limit; next available request [%s][%s] is not for [%d] seconds at [%s]'),
+ $method,
+ $url,
+ $sleepInterval,
+ $retryAfter
+ ));
+ }
+ }
+ // @codeCoverageIgnoreEnd
+ }
+
+ // do some common error checking
+ switch ($response->httpStatus()) {
+ case 401:
+ throw new Exceptions\HttpUnauthorizedError(sprintf(
+ Lang::translate('401 Unauthorized for [%s] [%s]'),
+ $url,
+ $response->HttpBody()
+ ));
+ break;
+ case 403:
+ throw new Exceptions\HttpForbiddenError(sprintf(
+ Lang::translate('403 Forbidden for [%s] [%s]'),
+ $url,
+ $response->HttpBody()
+ ));
+ break;
+ case 413: // limit
+ throw new Exceptions\HttpOverLimitError(sprintf(
+ Lang::translate('413 Over limit for [%s] [%s]'),
+ $url,
+ $response->HttpBody()
+ ));
+ break;
+ default:
+ // everything is fine here, we're fine, how are you?
+ break;
+ }
+
+ // free the handle
+ $http->close();
+
+ // return the HttpResponse object
+ $this->getLogger()->info('HTTP STATUS [{code}]', array(
+ 'code' => $response->httpStatus()
+ ));
+
+ return $response;
+ }
+
+ /**
+ * Sets default values for name, region, URL type for a service
+ *
+ * Once these are set (and they can also be set by defining global
+ * constants), then you do not need to specify these values when
+ * creating new service objects.
+ *
+ * @api
+ * @param string $service the name of a supported service; e.g. 'Compute'
+ * @param string $name the service name; e.g., 'cloudServersOpenStack'
+ * @param string $region the region name; e.g., 'LON'
+ * @param string $urltype the type of URL to use; e.g., 'internalURL'
+ * @return void
+ * @throws UnrecognizedServiceError
+ */
+ public function setDefaults(
+ $service,
+ $name = null,
+ $region = null,
+ $urltype = null
+ ) {
+
+ if (!isset($this->defaults[$service])) {
+ throw new Exceptions\UnrecognizedServiceError(sprintf(
+ Lang::translate('Service [%s] is not recognized'), $service
+ ));
+ }
+
+ if (isset($name)) {
+ $this->defaults[$service]['name'] = $name;
+ }
+
+ if (isset($region)) {
+ $this->defaults[$service]['region'] = $region;
+ }
+
+ if (isset($urltype)) {
+ $this->defaults[$service]['urltype'] = $urltype;
+ }
+ }
+
+ /**
+ * Allows the user to define a function for tracking uploads
+ *
+ * This can be used to implement a progress bar or similar function. The
+ * callback function is called with a single parameter, the length of the
+ * data that is being uploaded on this call.
+ *
+ * @param callable $callback the name of a global callback function, or an
+ * array($object, $functionname)
+ * @return void
+ */
+ public function setUploadProgressCallback($callback)
+ {
+ $this->_user_write_progress_callback_func = $callback;
+ }
+
+ /**
+ * Allows the user to define a function for tracking downloads
+ *
+ * This can be used to implement a progress bar or similar function. The
+ * callback function is called with a single parameter, the length of the
+ * data that is being downloaded on this call.
+ *
+ * @param callable $callback the name of a global callback function, or an
+ * array($object, $functionname)
+ * @return void
+ */
+ public function setDownloadProgressCallback($callback)
+ {
+ $this->_user_read_progress_callback_func = $callback;
+ }
+
+ /**
+ * Callback function to handle reads for file uploads
+ *
+ * Internal function for handling file uploads. Note that, although this
+ * function's visibility is public, this is only because it must be called
+ * from the HttpRequest interface. This should NOT be called by users
+ * directly.
+ *
+ * @param resource $ch a CURL handle
+ * @param resource $fd a file descriptor
+ * @param integer $length the amount of data to read
+ * @return string the data read
+ * @codeCoverageIgnore
+ */
+ public function _read_cb($ch, $fd, $length)
+ {
+ $data = fread($fd, $length);
+ $len = strlen($data);
+ if (isset($this->_user_write_progress_callback_func)) {
+ call_user_func($this->_user_write_progress_callback_func, $len);
+ }
+ return $data;
+ }
+
+ /**
+ * Callback function to handle writes for file downloads
+ *
+ * Internal function for handling file downloads. Note that, although this
+ * function's visibility is public, this is only because it must be called
+ * via the HttpRequest interface. This should NOT be called by users
+ * directly.
+ *
+ * @param resource $ch a CURL handle
+ * @param string $data the data to be written to a file
+ * @return integer the number of bytes written
+ * @codeCoverageIgnore
+ */
+ public function _write_cb($ch, $data)
+ {
+ $url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
+
+ if (false === ($fp = $this->getFileDescriptor($url))) {
+ throw new Exceptions\HttpUrlError(sprintf(
+ Lang::translate('Cannot find file descriptor for URL [%s]'), $url)
+ );
+ }
+
+ $dlen = strlen($data);
+ fwrite($fp, $data, $dlen);
+
+ // call used callback function
+ if (isset($this->_user_read_progress_callback_func)) {
+ call_user_func($this->_user_read_progress_callback_func, $dlen);
+ }
+
+ // MUST return the length to CURL
+ return $dlen;
+ }
+
+ /**
+ * exports saved token, expiration, tenant, and service catalog as an array
+ *
+ * This could be stored in a cache (APC or disk file) and reloaded using
+ * ImportCredentials()
+ *
+ * @return array
+ */
+ public function exportCredentials()
+ {
+ $this->authenticate();
+
+ $array = array();
+
+ foreach ($this->getExportItems() as $key) {
+ $array[$key] = $this->$key;
+ }
+
+ return $array;
+ }
+
+ /**
+ * imports credentials from an array
+ *
+ * Takes the same values as ExportCredentials() and reuses them.
+ *
+ * @return void
+ */
+ public function importCredentials(array $values)
+ {
+ foreach ($this->getExportItems() as $item) {
+ $this->$item = $values[$item];
+ }
+ }
+
+ /********** FACTORY METHODS **********
+ *
+ * These methods are provided to permit easy creation of services
+ * (for example, Nova or Swift) from a connection object. As new
+ * services are supported, factory methods should be provided here.
+ */
+
+ /**
+ * Creates a new ObjectStore object (Swift/Cloud Files)
+ *
+ * @api
+ * @param string $name the name of the Object Storage service to attach to
+ * @param string $region the name of the region to use
+ * @param string $urltype the URL type (normally "publicURL")
+ * @return ObjectStore
+ */
+ public function objectStore($name = null, $region = null, $urltype = null)
+ {
+ return $this->service('ObjectStore', $name, $region, $urltype);
+ }
+
+ /**
+ * Creates a new Compute object (Nova/Cloud Servers)
+ *
+ * @api
+ * @param string $name the name of the Compute service to attach to
+ * @param string $region the name of the region to use
+ * @param string $urltype the URL type (normally "publicURL")
+ * @return Compute
+ */
+ public function compute($name = null, $region = null, $urltype = null)
+ {
+ return $this->service('Compute', $name, $region, $urltype);
+ }
+
+ /**
+ * Creates a new Orchestration (heat) service object
+ *
+ * @api
+ * @param string $name the name of the Compute service to attach to
+ * @param string $region the name of the region to use
+ * @param string $urltype the URL type (normally "publicURL")
+ * @return Orchestration\Service
+ * @codeCoverageIgnore
+ */
+ public function orchestration($name = null, $region = null, $urltype = null)
+ {
+ return $this->service('Orchestration', $name, $region, $urltype);
+ }
+
+ /**
+ * Creates a new VolumeService (cinder) service object
+ *
+ * This is a factory method that is Rackspace-only (NOT part of OpenStack).
+ *
+ * @param string $name the name of the service (e.g., 'cloudBlockStorage')
+ * @param string $region the region (e.g., 'DFW')
+ * @param string $urltype the type of URL (e.g., 'publicURL');
+ */
+ public function volumeService($name = null, $region = null, $urltype = null)
+ {
+ return $this->service('Volume', $name, $region, $urltype);
+ }
+
+ /**
+ * Generic Service factory method
+ *
+ * Contains code reused by the other service factory methods.
+ *
+ * @param string $class the name of the Service class to produce
+ * @param string $name the name of the Compute service to attach to
+ * @param string $region the name of the region to use
+ * @param string $urltype the URL type (normally "publicURL")
+ * @return Service (or subclass such as Compute, ObjectStore)
+ * @throws ServiceValueError
+ */
+ public function service($class, $name = null, $region = null, $urltype = null)
+ {
+ // debug message
+ $this->getLogger()->info('Factory for class [{class}] [{name}/{region}/{urlType}]', array(
+ 'class' => $class,
+ 'name' => $name,
+ 'region' => $region,
+ 'urlType' => $urltype
+ ));
+
+ // Strips off base namespace
+ $class = preg_replace('#\\\?OpenCloud\\\#', '', $class);
+
+ // check for defaults
+ $default = $this->getDefault($class);
+
+ // report errors
+ if (!$name = $name ?: $default['name']) {
+ throw new Exceptions\ServiceValueError(sprintf(
+ Lang::translate('No value for %s name'),
+ $class
+ ));
+ }
+
+ if (!$region = $region ?: $default['region']) {
+ throw new Exceptions\ServiceValueError(sprintf(
+ Lang::translate('No value for %s region'),
+ $class
+ ));
+ }
+
+ if (!$urltype = $urltype ?: $default['urltype']) {
+ throw new Exceptions\ServiceValueError(sprintf(
+ Lang::translate('No value for %s URL type'),
+ $class
+ ));
+ }
+
+ // return the object
+ $fullclass = 'OpenCloud\\' . $class . '\\Service';
+
+ return new $fullclass($this, $name, $region, $urltype);
+ }
+
+ /**
+ * returns a service catalog item
+ *
+ * This is a helper function used to list service catalog items easily
+ */
+ public function serviceCatalogItem($info = array())
+ {
+ return new ServiceCatalogItem($info);
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Rackspace.php b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Rackspace.php
new file mode 100644
index 0000000000000000000000000000000000000000..41be608b347fb218d9df248986c19f1f4ebc83b9
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Rackspace.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * The Rackspace cloud/connection class (which uses different authentication
+ * than the pure OpenStack class)
+ *
+ * @copyright 2012-2013 Rackspace Hosting, Inc.
+ * See COPYING for licensing information
+ *
+ * @package phpOpenCloud
+ * @version 1.0
+ * @author Glen Campbell <glen.campbell@rackspace.com>
+ */
+
+namespace OpenCloud;
+
+/**
+ * Rackspace extends the OpenStack class with support for Rackspace's
+ * API key and tenant requirements.
+ *
+ * The only difference between Rackspace and OpenStack is that the
+ * Rackspace class generates credentials using the username
+ * and API key, as required by the Rackspace authentication
+ * service.
+ *
+ * Example:
+ * <code>
+ * $username = 'FRED';
+ * $apiKey = '0900af093093788912388fc09dde090ffee09';
+ * $conn = new Rackspace(
+ * 'https://identity.api.rackspacecloud.com/v2.0/',
+ * array(
+ * 'username' => $username,
+ * 'apiKey' => $apiKey
+ * ));
+ * </code>
+ */
+class Rackspace extends OpenStack
+{
+
+ //this is the JSON string for our new credentials
+const APIKEYTEMPLATE = <<<ENDCRED
+{ "auth": { "RAX-KSKEY:apiKeyCredentials": { "username": "%s",
+ "apiKey": "%s"
+ }
+ }
+}
+ENDCRED;
+
+ /**
+ * Generates Rackspace API key credentials
+ *
+ * @return string
+ */
+ public function Credentials()
+ {
+ $sec = $this->Secret();
+ if (isset($sec['username'])
+ && isset($sec['apiKey'])
+ ) {
+ return sprintf(
+ self::APIKEYTEMPLATE,
+ $sec['username'],
+ $sec['apiKey']
+ );
+ } else {
+ return parent::Credentials();
+ }
+ }
+
+ /**
+ * Creates a new DbService (Database as a Service) object
+ *
+ * This is a factory method that is Rackspace-only (NOT part of OpenStack).
+ *
+ * @param string $name the name of the service (e.g., 'Cloud Databases')
+ * @param string $region the region (e.g., 'DFW')
+ * @param string $urltype the type of URL (e.g., 'publicURL');
+ */
+ public function DbService($name = null, $region = null, $urltype = null)
+ {
+ return $this->Service('Database', $name, $region, $urltype);
+ }
+
+ /**
+ * Creates a new LoadBalancerService object
+ *
+ * This is a factory method that is Rackspace-only (NOT part of OpenStack).
+ *
+ * @param string $name the name of the service
+ * (e.g., 'Cloud Load Balancers')
+ * @param string $region the region (e.g., 'DFW')
+ * @param string $urltype the type of URL (e.g., 'publicURL');
+ */
+ public function LoadBalancerService($name = null, $region = null, $urltype = null)
+ {
+ return $this->Service('LoadBalancer', $name, $region, $urltype);
+ }
+
+ /**
+ * creates a new DNS service object
+ *
+ * This is a factory method that is currently Rackspace-only
+ * (not available via the OpenStack class)
+ */
+ public function DNS($name = null, $region = null, $urltype = null)
+ {
+ return $this->Service('DNS', $name, $region, $urltype);
+ }
+
+ /**
+ * creates a new CloudMonitoring service object
+ *
+ * This is a factory method that is currently Rackspace-only
+ * (not available via the OpenStack class)
+ */
+ public function CloudMonitoring($name=null, $region=null, $urltype=null)
+ {
+ return $this->Service('CloudMonitoring', $name, $region, $urltype);
+ }
+
+ /**
+ * creates a new Autoscale service object
+ *
+ * This is a factory method that is currently Rackspace-only
+ * (not available via the OpenStack class)
+ */
+ public function Autoscale($name=null, $region=null, $urltype=null)
+ {
+ return $this->Service('Autoscale', $name, $region, $urltype);
+ }
+
+}
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/openstack.php b/apps/files_external/3rdparty/php-opencloud/lib/openstack.php
new file mode 100644
index 0000000000000000000000000000000000000000..738902d244e9c600a02c8b391e757f945c68fd3d
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/openstack.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * provided for backwards compatibility
+ *
+ * @copyright 2013 Rackspace Hosting, Inc.
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ */
+require_once __DIR__.'/php-opencloud.php';
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/php-opencloud.php b/apps/files_external/3rdparty/php-opencloud/lib/php-opencloud.php
new file mode 100644
index 0000000000000000000000000000000000000000..15ff034b92de8baf88ef447591389103c5034a08
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/php-opencloud.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * entry point for PHP-OpenCloud library
+ *
+ * @copyright 2013 Rackspace Hosting, Inc.
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ */
+require_once(__DIR__ . '/Autoload.php');
+require_once(__DIR__ . '/OpenCloud/Globals.php');
+
+$classLoader = new ClassLoader;
+$classLoader->registerNamespaces(array(
+ 'OpenCloud' => array(__DIR__, __DIR__ . '/../tests')
+));
+$classLoader->register();
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/php-opencloud/lib/rackspace.php b/apps/files_external/3rdparty/php-opencloud/lib/rackspace.php
new file mode 100644
index 0000000000000000000000000000000000000000..738902d244e9c600a02c8b391e757f945c68fd3d
--- /dev/null
+++ b/apps/files_external/3rdparty/php-opencloud/lib/rackspace.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * provided for backwards compatibility
+ *
+ * @copyright 2013 Rackspace Hosting, Inc.
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ */
+require_once __DIR__.'/php-opencloud.php';
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index dd0b76ed9d7746a8e07c26c44776422820a2ac5f..f78f3abf0fa25f54a1e8cc349d93232a7399fc92 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -10,7 +10,7 @@ OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwra
OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php';
OC::$CLASSPATH['OC\Files\Storage\DAV'] = 'files_external/lib/webdav.php';
OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php';
-OC::$CLASSPATH['OC\Files\Storage\SWIFT'] = 'files_external/lib/swift.php';
+OC::$CLASSPATH['OC\Files\Storage\Swift'] = 'files_external/lib/swift.php';
OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 659959e662e439fcbd5ca80878fd482b277b4c5f..43643076519ec7b795055bd07c212e94cce8e21a 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -84,14 +84,22 @@ class OC_Mount_Config {
'token' => '#token'),
'custom' => 'google');
- $backends['\OC\Files\Storage\SWIFT']=array(
- 'backend' => 'OpenStack Swift',
- 'configuration' => array(
- 'host' => 'URL',
- 'user' => 'Username',
- 'token' => '*Token',
- 'root' => '&Root',
- 'secure' => '!Secure ftps://'));
+ if(OC_Mount_Config::checkcurl()) {
+ $backends['\OC\Files\Storage\Swift'] = array(
+ 'backend' => 'OpenStack Object Storage',
+ 'configuration' => array(
+ 'user' => 'Username (required)',
+ 'bucket' => 'Bucket (required)',
+ 'region' => '&Region (optional for OpenStack Object Storage)',
+ 'key' => '*API Key (required for Rackspace Cloud Files)',
+ 'tenant' => '&Tenantname (required for OpenStack Object Storage)',
+ 'password' => '*Password (required for OpenStack Object Storage)',
+ 'service_name' => '&Service Name (required for OpenStack Object Storage)',
+ 'url' => '&URL of identity endpoint (required for OpenStack Object Storage)',
+ 'timeout' => '&Timeout of HTTP requests in seconds (optional)',
+ )
+ );
+ }
if (!OC_Util::runningOnWindows()) {
if (OC_Mount_Config::checksmbclient()) {
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index a9cfe5bd20f69807f21a59f4920a38f25a656e80..bb650dacc7b0a4ae2c7c45060b1374bc29bafbd5 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -1,392 +1,271 @@
<?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.
+ * ownCloud
+ *
+ * @author Christian Berendt
+ * @copyright 2013 Christian Berendt berendt@b1-systems.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 OC\Files\Storage;
-require_once 'php-cloudfiles/cloudfiles.php';
-
-class SWIFT extends \OC\Files\Storage\Common{
- private $id;
- private $host;
- private $root;
- private $user;
- private $token;
- private $secure;
- private $ready = false;
- /**
- * @var \CF_Authentication auth
- */
- private $auth;
- /**
- * @var \CF_Connection conn
- */
- private $conn;
- /**
- * @var \CF_Container rootContainer
- */
- private $rootContainer;
-
- private static $tempFiles=array();
- private $objects=array();
- private $containers=array();
-
- const SUBCONTAINER_FILE='.subcontainers';
-
- /**
- * translate directory path to container name
- * @param string $path
- * @return string
- */
- private function getContainerName($path) {
- $path=trim(trim($this->root, '/') . "/".$path, '/.');
- return str_replace('/', '\\', $path);
- }
+set_include_path(get_include_path() . PATH_SEPARATOR .
+ \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib');
+require_once 'openstack.php';
- /**
- * get container by path
- * @param string $path
- * @return \CF_Container
- */
- private function getContainer($path) {
- if ($path=='' or $path=='/') {
- return $this->rootContainer;
- }
- if (isset($this->containers[$path])) {
- return $this->containers[$path];
- }
- try {
- $container=$this->conn->get_container($this->getContainerName($path));
- $this->containers[$path]=$container;
- return $container;
- } catch(\NoSuchContainerException $e) {
- return null;
- }
- }
+use \OpenCloud;
+use \OpenCloud\Common\Exceptions;
- /**
- * create container
- * @param string $path
- * @return \CF_Container
- */
- private function createContainer($path) {
- if ($path=='' or $path=='/' or $path=='.') {
- return $this->conn->create_container($this->getContainerName($path));
- }
- $parent=dirname($path);
- if ($parent=='' or $parent=='/' or $parent=='.') {
- $parentContainer=$this->rootContainer;
- } else {
- if ( ! $this->containerExists($parent)) {
- $parentContainer=$this->createContainer($parent);
- } else {
- $parentContainer=$this->getContainer($parent);
- }
+class Swift extends \OC\Files\Storage\Common {
+
+ /**
+ * @var \OpenCloud\ObjectStore
+ */
+ private $connection;
+ /**
+ * @var \OpenCloud\ObjectStore\Container
+ */
+ private $container;
+ /**
+ * @var \OpenCloud\OpenStack
+ */
+ private $anchor;
+ /**
+ * @var string
+ */
+ private $bucket;
+ /**
+ * @var array
+ */
+ private static $tmpFiles = array();
+
+ private function normalizePath($path) {
+ $path = trim($path, '/');
+
+ if (!$path) {
+ $path = '.';
}
- $this->addSubContainer($parentContainer, basename($path));
- return $this->conn->create_container($this->getContainerName($path));
+
+ return $path;
}
- /**
- * get object by path
- * @param string $path
- * @return \CF_Object
- */
- private function getObject($path) {
- if (isset($this->objects[$path])) {
- return $this->objects[$path];
- }
- $container=$this->getContainer(dirname($path));
- if (is_null($container)) {
- return null;
- } else {
- if ($path=="/" or $path=='') {
- return null;
- }
- try {
- $obj=$container->get_object(basename($path));
- $this->objects[$path]=$obj;
- return $obj;
- } catch(\NoSuchObjectException $e) {
- return null;
- }
+ private function doesObjectExist($path) {
+ try {
+ $object = $this->container->DataObject($path);
+ return true;
+ } catch (Exceptions\ObjFetchError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+ return false;
+ } catch (Exceptions\HttpError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+ return false;
}
}
- /**
- * get the names of all objects in a container
- * @param CF_Container
- * @return array
- */
- private function getObjects($container) {
- if (is_null($container)) {
- return array();
- } else {
- $files=$container->get_objects();
- foreach ($files as &$file) {
- $file=$file->name;
- }
- return $files;
+ public function __construct($params) {
+ if ((!isset($params['key']) and !isset($params['password']))
+ or !isset($params['user']) or !isset($params['bucket'])
+ or !isset($params['region'])) {
+ throw new \Exception("API Key or password, Username, Bucket and Region have to be configured.");
}
- }
- /**
- * create object
- * @param string $path
- * @return \CF_Object
- */
- private function createObject($path) {
- $container=$this->getContainer(dirname($path));
- if ( ! is_null($container)) {
- $container=$this->createContainer(dirname($path));
- }
- return $container->create_object(basename($path));
- }
+ $this->id = 'swift::' . $params['user'] . md5($params['bucket']);
+ $this->bucket = $params['bucket'];
- /**
- * check if an object exists
- * @param string
- * @return bool
- */
- private function objectExists($path) {
- return !is_null($this->getObject($path));
- }
+ if (!isset($params['url'])) {
+ $params['url'] = 'https://identity.api.rackspacecloud.com/v2.0/';
+ }
- /**
- * check if container for path exists
- * @param string $path
- * @return bool
- */
- private function containerExists($path) {
- return !is_null($this->getContainer($path));
- }
+ if (!isset($params['service_name'])) {
+ $params['service_name'] = 'cloudFiles';
+ }
- /**
- * get the list of emulated sub containers
- * @param \CF_Container $container
- * @return array
- */
- private function getSubContainers($container) {
- $tmpFile=\OCP\Files::tmpFile();
- $obj=$this->getSubContainerFile($container);
- try {
- $obj->save_to_filename($tmpFile);
- } catch(\Exception $e) {
- return array();
+ $settings = array(
+ 'username' => $params['user'],
+
+ );
+
+ if (isset($params['password'])) {
+ $settings['password'] = $params['password'];
+ } else if (isset($params['key'])) {
+ $settings['apiKey'] = $params['key'];
}
- $obj->save_to_filename($tmpFile);
- $containers=file($tmpFile);
- unlink($tmpFile);
- foreach ($containers as &$sub) {
- $sub=trim($sub);
+
+ if (isset($params['tenant'])) {
+ $settings['tenantName'] = $params['tenant'];
}
- return $containers;
- }
- /**
- * add an emulated sub container
- * @param \CF_Container $container
- * @param string $name
- * @return bool
- */
- private function addSubContainer($container, $name) {
- if ( ! $name) {
- return false;
+ $this->anchor = new \OpenCloud\OpenStack($params['url'], $settings);
+
+ if (isset($params['timeout'])) {
+ $this->anchor->setHttpTimeout($params['timeout']);
}
- $tmpFile=\OCP\Files::tmpFile();
- $obj=$this->getSubContainerFile($container);
+
+ $this->connection = $this->anchor->ObjectStore($params['service_name'], $params['region'], 'publicURL');
+
try {
- $obj->save_to_filename($tmpFile);
- $containers=file($tmpFile);
- foreach ($containers as &$sub) {
- $sub=trim($sub);
- }
- if(array_search($name, $containers) !== false) {
- unlink($tmpFile);
- return false;
- } else {
- $fh=fopen($tmpFile, 'a');
- fwrite($fh, $name . "\n");
- }
- } catch(\Exception $e) {
- file_put_contents($tmpFile, $name . "\n");
+ $this->container = $this->connection->Container($this->bucket);
+ } catch (Exceptions\ContainerNotFoundError $e) {
+ $this->container = $this->connection->Container();
+ $this->container->Create(array('name' => $this->bucket));
}
- $obj->load_from_filename($tmpFile);
- unlink($tmpFile);
- return true;
+ if (!$this->file_exists('.')) {
+ $this->mkdir('.');
+ }
}
- /**
- * remove an emulated sub container
- * @param \CF_Container $container
- * @param string $name
- * @return bool
- */
- private function removeSubContainer($container, $name) {
- if ( ! $name) {
- return false;
- }
- $tmpFile=\OCP\Files::tmpFile();
- $obj=$this->getSubContainerFile($container);
- try {
- $obj->save_to_filename($tmpFile);
- $containers=file($tmpFile);
- } catch (\Exception $e) {
+ public function mkdir($path) {
+ $path = $this->normalizePath($path);
+
+ if ($this->is_dir($path)) {
return false;
}
- foreach ($containers as &$sub) {
- $sub=trim($sub);
+
+ if($path !== '.') {
+ $path .= '/';
}
- $i=array_search($name, $containers);
- if ($i===false) {
- unlink($tmpFile);
+
+ try {
+ $object = $this->container->DataObject();
+ $object->Create(array(
+ 'name' => $path,
+ 'content_type' => 'httpd/unix-directory'
+ ));
+ } catch (Exceptions\CreateUpdateError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
- } else {
- unset($containers[$i]);
- file_put_contents($tmpFile, implode("\n", $containers)."\n");
}
- $obj->load_from_filename($tmpFile);
- unlink($tmpFile);
return true;
}
- /**
- * ensure a subcontainer file exists and return it's object
- * @param \CF_Container $container
- * @return \CF_Object
- */
- private function getSubContainerFile($container) {
- try {
- return $container->get_object(self::SUBCONTAINER_FILE);
- } catch(\NoSuchObjectException $e) {
- return $container->create_object(self::SUBCONTAINER_FILE);
- }
- }
+ public function file_exists($path) {
+ $path = $this->normalizePath($path);
- public function __construct($params) {
- if (isset($params['token']) && isset($params['host']) && isset($params['user'])) {
- $this->token=$params['token'];
- $this->host=$params['host'];
- $this->user=$params['user'];
- $this->root=isset($params['root'])?$params['root']:'/';
- if (isset($params['secure'])) {
- if (is_string($params['secure'])) {
- $this->secure = ($params['secure'] === 'true');
- } else {
- $this->secure = (bool)$params['secure'];
- }
- } else {
- $this->secure = false;
- }
- if ( ! $this->root || $this->root[0]!='/') {
- $this->root='/'.$this->root;
- }
- $this->id = 'swift:' . $this->host . ':'.$this->root . ':' . $this->user;
- } else {
- throw new \Exception();
+ if ($path !== '.' && $this->is_dir($path)) {
+ $path .= '/';
}
+ return $this->doesObjectExist($path);
}
- private function init(){
- if($this->ready) {
- return;
+ public function rmdir($path) {
+ $path = $this->normalizePath($path);
+
+ if (!$this->is_dir($path)) {
+ return false;
}
- $this->ready = true;
- $this->auth = new \CF_Authentication($this->user, $this->token, null, $this->host);
- $this->auth->authenticate();
+ $dh = $this->opendir($path);
+ while ($file = readdir($dh)) {
+ if ($file === '.' || $file === '..') {
+ continue;
+ }
- $this->conn = new \CF_Connection($this->auth);
+ if ($this->is_dir($path . '/' . $file)) {
+ $this->rmdir($path . '/' . $file);
+ } else {
+ $this->unlink($path . '/' . $file);
+ }
+ }
- if ( ! $this->containerExists('/')) {
- $this->rootContainer=$this->createContainer('/');
- } else {
- $this->rootContainer=$this->getContainer('/');
+ try {
+ $object = $this->container->DataObject($path . '/');
+ $object->Delete();
+ } catch (Exceptions\DeleteError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+ return false;
}
- }
- public function getId(){
- return $this->id;
+ return true;
}
+ public function opendir($path) {
+ $path = $this->normalizePath($path);
- public function mkdir($path) {
- $this->init();
- if ($this->containerExists($path)) {
- return false;
+ if ($path === '.') {
+ $path = '';
} else {
- $this->createContainer($path);
- return true;
+ $path .= '/';
}
- }
- public function rmdir($path) {
- $this->init();
- if (!$this->containerExists($path)) {
- return false;
- } else {
- $this->emptyContainer($path);
- if ($path!='' and $path!='/') {
- $parentContainer=$this->getContainer(dirname($path));
- $this->removeSubContainer($parentContainer, basename($path));
+ try {
+ $files = array();
+ $objects = $this->container->ObjectList(array(
+ 'prefix' => $path,
+ 'delimiter' => '/'
+ ));
+
+ while ($object = $objects->Next()) {
+ $file = basename($object->Name());
+ if ($file !== basename($path)) {
+ $files[] = $file;
+ }
}
- $this->conn->delete_container($this->getContainerName($path));
- unset($this->containers[$path]);
- return true;
+ \OC\Files\Stream\Dir::register('swift' . $path, $files);
+ return opendir('fakedir://swift' . $path);
+ } catch (Exception $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+ return false;
}
+
}
- private function emptyContainer($path) {
- $container=$this->getContainer($path);
- if (is_null($container)) {
- return;
- }
- $subContainers=$this->getSubContainers($container);
- foreach ($subContainers as $sub) {
- if ($sub) {
- $this->emptyContainer($path.'/'.$sub);
- $this->conn->delete_container($this->getContainerName($path.'/'.$sub));
- unset($this->containers[$path.'/'.$sub]);
- }
+ public function stat($path) {
+ $path = $this->normalizePath($path);
+
+ if ($this->is_dir($path) && $path != '.') {
+ $path .= '/';
}
- $objects=$this->getObjects($container);
- foreach ($objects as $object) {
- $container->delete_object($object);
- unset($this->objects[$path.'/'.$object]);
+ try {
+ $object = $this->container->DataObject($path);
+ } catch (Exceptions\ObjFetchError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+ return false;
}
- }
- public function opendir($path) {
- $this->init();
- $container=$this->getContainer($path);
- $files=$this->getObjects($container);
- $i=array_search(self::SUBCONTAINER_FILE, $files);
- if ($i!==false) {
- unset($files[$i]);
- }
- $subContainers=$this->getSubContainers($container);
- $files=array_merge($files, $subContainers);
- $id=$this->getContainerName($path);
- \OC\Files\Stream\Dir::register($id, $files);
- return opendir('fakedir://'.$id);
+ $mtime = $object->extra_headers['X-Timestamp'];
+ if (isset($object->extra_headers['X-Object-Meta-Timestamp'])) {
+ $mtime = $object->extra_headers['X-Object-Meta-Timestamp'];
+ }
+
+ $stat = array();
+ $stat['size'] = $object->content_length;
+ $stat['mtime'] = $mtime;
+ $stat['atime'] = time();
+ return $stat;
}
public function filetype($path) {
- $this->init();
- if ($this->containerExists($path)) {
- return 'dir';
- } else {
+ $path = $this->normalizePath($path);
+
+ if ($path !== '.' && $this->doesObjectExist($path)) {
return 'file';
}
+
+ if ($path !== '.') {
+ $path .= '/';
+ }
+
+ if ($this->doesObjectExist($path)) {
+ return 'dir';
+ }
}
public function isReadable($path) {
@@ -397,66 +276,44 @@ class SWIFT extends \OC\Files\Storage\Common{
return true;
}
- public function file_exists($path) {
- $this->init();
- if ($this->is_dir($path)) {
- return true;
- } else {
- return $this->objectExists($path);
- }
- }
+ public function unlink($path) {
+ $path = $this->normalizePath($path);
- public function file_get_contents($path) {
- $this->init();
- $obj=$this->getObject($path);
- if (is_null($obj)) {
+ try {
+ $object = $this->container->DataObject($path);
+ $object->Delete();
+ } catch (Exceptions\DeleteError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
- }
- return $obj->read();
- }
-
- public function file_put_contents($path, $content) {
- $this->init();
- $obj=$this->getObject($path);
- if (is_null($obj)) {
- $container=$this->getContainer(dirname($path));
- if (is_null($container)) {
- return false;
- }
- $obj=$container->create_object(basename($path));
- }
- $this->resetMTime($obj);
- return $obj->write($content);
- }
-
- public function unlink($path) {
- $this->init();
- if ($this->containerExists($path)) {
- return $this->rmdir($path);
- }
- if ($this->objectExists($path)) {
- $container=$this->getContainer(dirname($path));
- $container->delete_object(basename($path));
- unset($this->objects[$path]);
- } else {
+ } catch (Exceptions\ObjFetchError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
+
+ return true;
}
public function fopen($path, $mode) {
- $this->init();
- switch($mode) {
+ $path = $this->normalizePath($path);
+
+ switch ($mode) {
case 'r':
case 'rb':
- $obj=$this->getObject($path);
- if (is_null($obj)) {
+ $tmpFile = \OC_Helper::tmpFile();
+ self::$tmpFiles[$tmpFile] = $path;
+ try {
+ $object = $this->container->DataObject($path);
+ } catch (Exceptions\ObjFetchError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
return false;
}
- $fp = fopen('php://temp', 'r+');
- $obj->stream($fp);
-
- rewind($fp);
- return $fp;
+ try {
+ $object->SaveToFilename($tmpFile);
+ } catch (Exceptions\IOError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+ return false;
+ }
+ return fopen($tmpFile, 'r');
case 'w':
case 'wb':
case 'a':
@@ -469,119 +326,166 @@ class SWIFT extends \OC\Files\Storage\Common{
case 'x+':
case 'c':
case 'c+':
- $tmpFile=$this->getTmpFile($path);
+ if (strrpos($path, '.') !== false) {
+ $ext = substr($path, strrpos($path, '.'));
+ } else {
+ $ext = '';
+ }
+ $tmpFile = \OC_Helper::tmpFile($ext);
\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
- self::$tempFiles[$tmpFile]=$path;
- return fopen('close://'.$tmpFile, $mode);
+ if ($this->file_exists($path)) {
+ $source = $this->fopen($path, 'r');
+ file_put_contents($tmpFile, $source);
+ }
+ self::$tmpFiles[$tmpFile] = $path;
+
+ return fopen('close://' . $tmpFile, $mode);
}
}
- public function writeBack($tmpFile) {
- if (isset(self::$tempFiles[$tmpFile])) {
- $this->fromTmpFile($tmpFile, self::$tempFiles[$tmpFile]);
- unlink($tmpFile);
+ public function getMimeType($path) {
+ $path = $this->normalizePath($path);
+
+ if ($this->is_dir($path)) {
+ return 'httpd/unix-directory';
+ } else if ($this->file_exists($path)) {
+ $object = $this->container->DataObject($path);
+ return $object->extra_headers["Content-Type"];
}
+ return false;
}
- public function touch($path, $mtime=null) {
- $this->init();
- $obj=$this->getObject($path);
- if (is_null($obj)) {
- return false;
+ public function touch($path, $mtime = null) {
+ $path = $this->normalizePath($path);
+ if ($this->file_exists($path)) {
+ if ($this->is_dir($path) && $path != '.') {
+ $path .= '/';
+ }
+
+ $object = $this->container->DataObject($path);
+ if( is_null($mtime)) {
+ $mtime = time();
+ }
+ $settings = array(
+ 'name' => $path,
+ 'extra_headers' => array(
+ 'X-Object-Meta-Timestamp' => $mtime
+ )
+ );
+ $object->Update($settings);
+ } else {
+ $object = $this->container->DataObject();
+ if (is_null($mtime)) {
+ $mtime = time();
+ }
+ $settings = array(
+ 'name' => $path,
+ 'content_type' => 'text/plain',
+ 'extra_headers' => array(
+ 'X-Object-Meta-Timestamp' => $mtime
+ )
+ );
+ $object->Create($settings);
}
- if (is_null($mtime)) {
- $mtime=time();
+ }
+
+ public function copy($path1, $path2) {
+ $path1 = $this->normalizePath($path1);
+ $path2 = $this->normalizePath($path2);
+
+ if ($this->is_file($path1)) {
+ try {
+ $source = $this->container->DataObject($path1);
+ $target = $this->container->DataObject();
+ $target->Create(array(
+ 'name' => $path2,
+ ));
+ $source->Copy($target);
+ } catch (Exceptions\ObjectCopyError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+ return false;
+ }
+ } else {
+ if ($this->file_exists($path2)) {
+ return false;
+ }
+
+ try {
+ $source = $this->container->DataObject($path1 . '/');
+ $target = $this->container->DataObject();
+ $target->Create(array(
+ 'name' => $path2 . '/',
+ ));
+ $source->Copy($target);
+ } catch (Exceptions\ObjectCopyError $e) {
+ \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+ return false;
+ }
+
+ $dh = $this->opendir($path1);
+ while ($file = readdir($dh)) {
+ if ($file === '.' || $file === '..') {
+ continue;
+ }
+
+ $source = $path1 . '/' . $file;
+ $target = $path2 . '/' . $file;
+ $this->copy($source, $target);
+ }
}
- //emulate setting mtime with metadata
- $obj->metadata['Mtime']=$mtime;
- $obj->sync_metadata();
+ return true;
}
public function rename($path1, $path2) {
- $this->init();
- $sourceContainer=$this->getContainer(dirname($path1));
- $targetContainer=$this->getContainer(dirname($path2));
- $result=$sourceContainer->move_object_to(basename($path1), $targetContainer, basename($path2));
- unset($this->objects[$path1]);
- if ($result) {
- $targetObj=$this->getObject($path2);
- $this->resetMTime($targetObj);
- }
- return $result;
- }
+ $path1 = $this->normalizePath($path1);
+ $path2 = $this->normalizePath($path2);
- public function copy($path1, $path2) {
- $this->init();
- $sourceContainer=$this->getContainer(dirname($path1));
- $targetContainer=$this->getContainer(dirname($path2));
- $result=$sourceContainer->copy_object_to(basename($path1), $targetContainer, basename($path2));
- if ($result) {
- $targetObj=$this->getObject($path2);
- $this->resetMTime($targetObj);
- }
- return $result;
- }
+ if ($this->is_file($path1)) {
+ if ($this->copy($path1, $path2) === false) {
+ return false;
+ }
- public function stat($path) {
- $this->init();
- $container=$this->getContainer($path);
- if ( ! is_null($container)) {
- return array(
- 'mtime'=>-1,
- 'size'=>$container->bytes_used,
- 'ctime'=>-1
- );
- }
+ if ($this->unlink($path1) === false) {
+ $this->unlink($path2);
+ return false;
+ }
+ } else {
+ if ($this->file_exists($path2)) {
+ return false;
+ }
- $obj=$this->getObject($path);
+ if ($this->copy($path1, $path2) === false) {
+ return false;
+ }
- if (is_null($obj)) {
- return false;
+ if ($this->rmdir($path1) === false) {
+ $this->rmdir($path2);
+ return false;
+ }
}
- if (isset($obj->metadata['Mtime']) and $obj->metadata['Mtime']>-1) {
- $mtime=$obj->metadata['Mtime'];
- } else {
- $mtime=strtotime($obj->last_modified);
- }
- return array(
- 'mtime'=>$mtime,
- 'size'=>$obj->content_length,
- 'ctime'=>-1,
- );
+ return true;
}
- private function getTmpFile($path) {
- $this->init();
- $obj=$this->getObject($path);
- if ( ! is_null($obj)) {
- $tmpFile=\OCP\Files::tmpFile();
- $obj->save_to_filename($tmpFile);
- return $tmpFile;
- } else {
- return \OCP\Files::tmpFile();
- }
+ public function getId() {
+ return $this->id;
}
- private function fromTmpFile($tmpFile, $path) {
- $this->init();
- $obj=$this->getObject($path);
- if (is_null($obj)) {
- $obj=$this->createObject($path);
- }
- $obj->load_from_filename($tmpFile);
- $this->resetMTime($obj);
+ public function getConnection() {
+ return $this->connection;
}
- /**
- * remove custom mtime metadata
- * @param \CF_Object $obj
- */
- private function resetMTime($obj) {
- if (isset($obj->metadata['Mtime'])) {
- $obj->metadata['Mtime']=-1;
- $obj->sync_metadata();
+ public function writeBack($tmpFile) {
+ if (!isset(self::$tmpFiles[$tmpFile])) {
+ return false;
}
+
+ $object = $this->container->DataObject();
+ $object->Create(array(
+ 'name' => self::$tmpFiles[$tmpFile],
+ 'content_type' => \OC_Helper::getMimeType($tmpFile)
+ ), $tmpFile);
+ unlink($tmpFile);
}
}
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index d4a69d29c0f54341aac18daef36d81c1ba4f1e60..a523809e2f9b51a8dde5f513a689824f619907a4 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -30,12 +30,17 @@ return array(
'client_secret' => '',
'token' => '',
),
- 'swift'=>array(
- 'run'=>false,
- 'user'=>'test:tester',
- 'token'=>'testing',
- 'host'=>'localhost.local:8080/auth',
- 'root'=>'/',
+ 'swift' => array(
+ 'run' => false,
+ 'user' => 'test',
+ 'bucket' => 'test',
+ 'region' => 'DFW',
+ 'key' => 'test', //to be used only with Rackspace Cloud Files
+ //'tenant' => 'test', //to be used only with OpenStack Object Storage
+ //'password' => 'test', //to be use only with OpenStack Object Storage
+ //'service_name' => 'swift', //should be 'swift' for OpenStack Object Storage and 'cloudFiles' for Rackspace Cloud Files (default value)
+ //'url' => 'https://identity.api.rackspacecloud.com/v2.0/', //to be used with Rackspace Cloud Files and OpenStack Object Storage
+ //'timeout' => 5 // timeout of HTTP requests in seconds
),
'smb'=>array(
'run'=>false,
diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
index 5c78284024627732613575d009689bd0feac450f..bdfdbdeebe9a071cd36bbc55737f9d6a9a5f3c6d 100644
--- a/apps/files_external/tests/swift.php
+++ b/apps/files_external/tests/swift.php
@@ -1,30 +1,51 @@
<?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.
+ * ownCloud
+ *
+ * @author Christian Berendt
+ * @copyright 2013 Christian Berendt berendt@b1-systems.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 Test\Files\Storage;
-class SWIFT extends Storage {
+class Swift extends Storage {
+
private $config;
public function setUp() {
- $id = uniqid();
$this->config = include('files_external/tests/config.php');
- if ( ! is_array($this->config) or ! isset($this->config['swift']) or ! $this->config['swift']['run']) {
- $this->markTestSkipped('OpenStack SWIFT backend not configured');
+ if (!is_array($this->config) or !isset($this->config['swift'])
+ or !$this->config['swift']['run']) {
+ $this->markTestSkipped('OpenStack Object Storage backend not configured');
}
- $this->config['swift']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
- $this->instance = new \OC\Files\Storage\SWIFT($this->config['swift']);
+ $this->instance = new \OC\Files\Storage\Swift($this->config['swift']);
}
-
public function tearDown() {
if ($this->instance) {
- $this->instance->rmdir('');
+ $connection = $this->instance->getConnection();
+ $container = $connection->Container($this->config['swift']['bucket']);
+
+ $objects = $container->ObjectList();
+ while($object = $objects->Next()) {
+ $object->Delete();
+ }
+
+ $container->Delete();
}
}
}
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 3e1dec9bbe112df063661871c3caa6f5a3a360f6..801c27506f137f2637dd4ac48461ca4780a02e57 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -4,14 +4,14 @@ body {
#header {
background: #1d2d44 url('%webroot%/core/img/noise.png') repeat;
- height:2.5em;
+ height:32px;
left:0;
- line-height:2.5em;
+ line-height:32px;
position:fixed;
right:0;
top:0;
z-index:100;
- padding:.5em;
+ padding:7px;
}
#details {
@@ -24,13 +24,18 @@ body {
font-weight:700;
margin: 0 0.4em 0 0;
padding: 0 5px;
- height: 27px;
+ height: 32px;
float: left;
}
.header-right #details {
- margin-right: 2em;
+ margin-right: 28px;
+}
+
+.header-right {
+ padding: 0;
+ height: 32px;
}
#public_upload {
@@ -90,7 +95,7 @@ thead{
#data-upload-form {
position: relative;
right: 0;
- height: 27px;
+ height: 32px;
overflow: hidden;
padding: 0;
float: right;
@@ -109,27 +114,20 @@ thead{
width: 100% !important;
}
-#download span {
- position: relative;
- bottom: 3px;
-}
-
#publicUploadButtonMock {
position:relative;
display:block;
width:100%;
- height:27px;
+ height:32px;
cursor:pointer;
z-index:10;
background-image:url('%webroot%/core/img/actions/upload.svg');
background-repeat:no-repeat;
- background-position:7px 6px;
+ background-position:7px 8px;
}
#publicUploadButtonMock span {
margin: 0 5px 0 28px;
- position: relative;
- top: -2px;
color: #555;
}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 68f6f3ba76f6e9d1eba761b534ea9d91be85227d..340e0939445eff6c639ec626fbcba89d7adb09db 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -35,14 +35,14 @@ $(document).ready(function() {
if ($(tr).data('id') != $('#dropdown').attr('data-item-source')) {
OC.Share.hideDropDown(function () {
$(tr).addClass('mouseOver');
- OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
+ OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions, filename);
});
} else {
OC.Share.hideDropDown();
}
} else {
$(tr).addClass('mouseOver');
- OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
+ OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions, filename);
}
});
}
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
index 3381f75f16df6e1794c7a63aeeac50152ac0a533..171999ea6523e141b7d6e9eac3269a15216bd5ee 100644
--- a/apps/files_sharing/lib/updater.php
+++ b/apps/files_sharing/lib/updater.php
@@ -49,13 +49,6 @@ class Shared_Updater {
}
$users = $reshareUsers;
}
- // Correct folders of shared file owner
- $target = substr($target, 8);
- if ($uidOwner !== $uid && $source = \OC_Share_Backend_File::getSource($target)) {
- \OC\Files\Filesystem::initMountPoints($uidOwner);
- $source = '/'.$uidOwner.'/'.$source['path'];
- \OC\Files\Cache\Updater::correctFolder($source, $info['mtime']);
- }
}
}
diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php
index 0b8e4ccfe2048dac6248a43eb667dc75b64b5ddf..b31fd983995428ae773c7aad117de3a449ea12ba 100644
--- a/apps/user_ldap/ajax/testConfiguration.php
+++ b/apps/user_ldap/ajax/testConfiguration.php
@@ -41,5 +41,5 @@ if($connection->setConfiguration($_POST)) {
}
} else {
OCP\JSON::error(array('message'
- => $l->t('The configuration is invalid. Please look in the ownCloud log for further details.')));
+ => $l->t('The configuration is invalid. Please have a look at the logs for further details.')));
}
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index 69abaec4dfc6540bcf514f45c2cf7e943f12a9a0..ee8bb28425c5781f9365abbc8c9856db176a8478 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -2,8 +2,10 @@
$TRANSLATIONS = array(
"Failed to clear the mappings." => "Nepavyko išvalyti sąsajų.",
"Failed to delete the server configuration" => "Nepavyko pašalinti serverio konfigūracijos",
+"The configuration is valid and the connection could be established!" => "Konfigūracija yra tinkama bei prisijungta sėkmingai!",
"Deletion failed" => "Ištrinti nepavyko",
"Keep settings?" => "Išlaikyti nustatymus?",
+"Cannot add server configuration" => "Negalima pridėti serverio konfigūracijos",
"mappings cleared" => "susiejimai išvalyti",
"Success" => "Sėkmingai",
"Error" => "Klaida",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index f133260383cba4ba8b4c052077bee1512d9e4a4b..a07bd3fa11fc06cac2a1e942ddaf91c460458e44 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -356,7 +356,7 @@ class Access extends LDAPUtility {
}
//if everything else did not help..
- \OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', \OCP\Util::INFO);
+ \OCP\Util::writeLog('user_ldap', 'Could not create unique name for '.$dn.'.', \OCP\Util::INFO);
return false;
}
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 0dacc17d3a55daced1aff209c15b069554045db7..be02c056357519a89d52c2fd517b5ea64f78f61d 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -41,7 +41,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$_POST['itemSource'],
$shareType,
$shareWith,
- $_POST['permissions']
+ $_POST['permissions'],
+ $_POST['itemSourceName']
);
if (is_string($token)) {
diff --git a/core/js/share.js b/core/js/share.js
index ff557652b67a8a894edff36e4be89dd84a5575fb..c53fa4110b536824aa00ea3e15eafab1e89d952f 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -136,8 +136,17 @@ OC.Share={
return data;
},
- share:function(itemType, itemSource, shareType, shareWith, permissions, callback) {
- $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'share', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
+ share:function(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, callback) {
+ $.post(OC.filePath('core', 'ajax', 'share.php'),
+ {
+ action: 'share',
+ itemType: itemType,
+ itemSource: itemSource,
+ shareType: shareType,
+ shareWith: shareWith,
+ permissions: permissions,
+ itemSourceName: itemSourceName
+ }, function (result) {
if (result && result.status === 'success') {
if (callback) {
callback(result.data);
@@ -170,9 +179,9 @@ OC.Share={
}
});
},
- showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions) {
+ showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
var data = OC.Share.loadItem(itemType, itemSource);
- var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
+ var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'"" data-item-source-name="'+filename+'">';
if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
html += '<span class="reshare">'+t('core', 'Shared with you and the group {group} by {owner}', {group: escapeHTML(data.reshare.share_with), owner: escapeHTML(data.reshare.displayname_owner)})+'</span>';
@@ -276,12 +285,13 @@ OC.Share={
event.stopPropagation();
var itemType = $('#dropdown').data('item-type');
var itemSource = $('#dropdown').data('item-source');
+ var itemSourceName = $('#dropdown').data('item-source-name');
var shareType = selected.item.value.shareType;
var shareWith = selected.item.value.shareWith;
$(this).val(shareWith);
// Default permissions are Edit (CRUD) and Share
var permissions = OC.PERMISSION_ALL;
- OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() {
+ OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, function() {
OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
$('#shareWith').val('');
OC.Share.updateIcon(itemType, itemSource);
@@ -573,9 +583,10 @@ $(document).ready(function() {
$(document).on('change', '#dropdown #linkCheckbox', function() {
var itemType = $('#dropdown').data('item-type');
var itemSource = $('#dropdown').data('item-source');
+ var itemSourceName = $('#dropdown').data('item-source-name');
if (this.checked) {
// Create a link
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function(data) {
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, function(data) {
OC.Share.showLink(data.token, null, itemSource);
OC.Share.updateIcon(itemType, itemSource);
});
@@ -604,6 +615,7 @@ $(document).ready(function() {
var allowPublicUpload = $(this).is(':checked');
var itemType = $('#dropdown').data('item-type');
var itemSource = $('#dropdown').data('item-source');
+ var itemSourceName = $('#dropdown').data('item-source-name');
var permissions = 0;
// Calculate permissions
@@ -614,7 +626,7 @@ $(document).ready(function() {
}
// Update the share information
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) {
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, function(data) {
});
});
@@ -623,6 +635,7 @@ $(document).ready(function() {
if (!$('#showPassword').is(':checked') ) {
var itemType = $('#dropdown').data('item-type');
var itemSource = $('#dropdown').data('item-source');
+ var itemSourceName = $('#dropdown').data('item-source-name');
var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
var permissions = 0;
@@ -634,7 +647,7 @@ $(document).ready(function() {
}
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions);
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName);
} else {
$('#linkPassText').focus();
}
@@ -648,6 +661,7 @@ $(document).ready(function() {
var dropDown = $('#dropdown');
var itemType = dropDown.data('item-type');
var itemSource = dropDown.data('item-source');
+ var itemSourceName = $('#dropdown').data('item-source-name');
var permissions = 0;
// Calculate permissions
@@ -657,7 +671,7 @@ $(document).ready(function() {
permissions = OC.PERMISSION_READ;
}
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, function() {
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, function() {
console.log("password set to: '" + linkPassText.val() +"' by event: " + event.type);
linkPassText.val('');
linkPassText.attr('placeholder', t('core', 'Password protected'));
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 6a0bbc53ac92497fbacadabf6cb1451d7dd676fc..e0a564a5094ca3b5bb7d1340da37c53007295cac 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -10,7 +10,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
"You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
"Username" => "Gebruikersnaam",
-"Request reset" => "Herstel-versoek",
"Your password was reset" => "Jou wagwoord is herstel",
"To login page" => "Na aanteken-bladsy",
"New password" => "Nuwe wagwoord",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 481db3a6d61765a8392306c2f93a007aee92aa20..b3c43a96cba6d1baadf150afe4c32dfb2f8ee157 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -79,7 +79,6 @@ $TRANSLATIONS = array(
"Request failed!<br>Did you make sure your email/username was right?" => "الطلب رفض! <br> هل انت متأكد أن الاسم/العنوان البريدي صحيح؟",
"You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
"Username" => "إسم المستخدم",
-"Request reset" => "طلب تعديل",
"Your password was reset" => "لقد تم تعديل كلمة السر",
"To login page" => "الى صفحة الدخول",
"New password" => "كلمات سر جديدة",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index efad7496615031099f585b94e2bd0855de606d9f..dbed3e20637cf5a83f95480089b55a2f17a6ab33 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -44,7 +44,6 @@ $TRANSLATIONS = array(
"Add" => "Добавяне",
"You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
"Username" => "Потребител",
-"Request reset" => "Нулиране на заявка",
"Your password was reset" => "Вашата парола е нулирана",
"New password" => "Нова парола",
"Reset password" => "Нулиране на парола",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index ff21c33b6deea9f368944e890fd22f5223a5fdd3..d9de954152dea8c40088f3d5fc617b168a8a31a7 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "আপনার কূটশব্দটি পূনঃনির্ধারণ করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
"You will receive a link to reset your password via Email." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
"Username" => "ব্যবহারকারী",
-"Request reset" => "অনুরোধ পূনঃনির্ধারণ",
"Your password was reset" => "আপনার কূটশব্দটি পূনঃনির্ধারণ করা হয়েছে",
"To login page" => "প্রবেশ পৃষ্ঠায়",
"New password" => "নতুন কূটশব্দ",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index b962ad004a2a848ed806886bb158b59eaec369f9..b545350edce80cb872c928b11cd4dd0e3fee1460 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Nom d'usuari",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
"Yes, I really want to reset my password now" => "Sí, vull restablir ara la contrasenya",
-"Request reset" => "Sol·licita reinicialització",
"Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",
"To login page" => "A la pàgina d'inici de sessió",
"New password" => "Contrasenya nova",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 3229dcc76d97916e2ad58018cac97d90692c91b3..e4dea516cf32c14be94f3f0df7e4caec2b96af5e 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
"Username" => "Uživatelské jméno",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
"Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit mé heslo",
-"Request reset" => "Vyžádat obnovu",
"Your password was reset" => "Vaše heslo bylo obnoveno",
"To login page" => "Na stránku přihlášení",
"New password" => "Nové heslo",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 8dc8dea8921e42a0738d0995ba752f20c362abfd..aa10715d0a8ce2d36df3684ed2c50c66c408fe30 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -79,7 +79,6 @@ $TRANSLATIONS = array(
"Request failed!<br>Did you make sure your email/username was right?" => "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost.",
"You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
"Username" => "Enw defnyddiwr",
-"Request reset" => "Gwneud cais i ailosod",
"Your password was reset" => "Ailosodwyd eich cyfrinair",
"To login page" => "I'r dudalen mewngofnodi",
"New password" => "Cyfrinair newydd",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 9a0a13f3593e5e023e1e483d5787029bcce72440..8d9ef3abc31e66f34f359aaee540398147e8f890 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -104,7 +104,6 @@ $TRANSLATIONS = array(
"Username" => "Brugernavn",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
"Yes, I really want to reset my password now" => "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
-"Request reset" => "Anmod om nulstilling",
"Your password was reset" => "Dit kodeord blev nulstillet",
"To login page" => "Til login-side",
"New password" => "Nyt kodeord",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 0aa5a6243a39899ddd511e163507ad4720903d0b..d14a30e19dec3a1e578b6f9fb62b4ec1f33dc46e 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Benutzername",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
"Yes, I really want to reset my password now" => "Ja, ich will mein Passwort jetzt wirklich zurücksetzen",
-"Request reset" => "Beantrage Zurücksetzung",
"Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
"To login page" => "Zur Login-Seite",
"New password" => "Neues Passwort",
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index ceaf5af0edc9ca0007e7890898328b4520900b56..993483ad54382679c34ee8486b168b21d1c18825 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -84,7 +84,6 @@ $TRANSLATIONS = array(
"Username" => "Benutzername",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
"Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-"Request reset" => "Zurücksetzung anfordern",
"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
"To login page" => "Zur Login-Seite",
"New password" => "Neues Passwort",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 9504e5b6ff71b4011a322ab647653d7863208c4d..f9a05f7d91d2133bfbb0da54ae926c2774f31104 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Benutzername",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
"Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-"Request reset" => "Zurücksetzung anfordern",
"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
"To login page" => "Zur Login-Seite",
"New password" => "Neues Passwort",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 5edfbbe060f1a1dec24b5edacfd551366659fc69..2ad60dd98cf487d33ec7c1dfed8dc17fe6440bc2 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -94,7 +94,6 @@ $TRANSLATIONS = array(
"Username" => "Όνομα χρήστη",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
"Yes, I really want to reset my password now" => "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
-"Request reset" => "Επαναφορά αίτησης",
"Your password was reset" => "Ο κωδικός πρόσβασής σας επαναφέρθηκε",
"To login page" => "Σελίδα εισόδου",
"New password" => "Νέο συνθηματικό",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 526b5264a904c0d0abc6ec32a8317c65c8f0578c..b9842d2bfaf63ea15d31165c6d531de9f792b9ba 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Username",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?",
"Yes, I really want to reset my password now" => "Yes, I really want to reset my password now",
-"Request reset" => "Request reset",
"Your password was reset" => "Your password was reset",
"To login page" => "To login page",
"New password" => "New password",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 9cd2beed44a27f5b7277120c560fa6a0ef141701..2f779a551bfb45ec12accab915321b067d386cef 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -80,7 +80,6 @@ $TRANSLATIONS = array(
"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
"Username" => "Uzantonomo",
"Yes, I really want to reset my password now" => "Jes, mi vere volas restarigi mian pasvorton nun",
-"Request reset" => "Peti rekomencigon",
"Your password was reset" => "Via pasvorto rekomencis",
"To login page" => "Al la ensaluta paĝo",
"New password" => "Nova pasvorto",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 82ccef46e6d0f9eaf677df6265b464d386df2582..de6812d56dd5ef09952aac05658f3bf82071942a 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Nombre de usuario",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
"Yes, I really want to reset my password now" => "Sí. Realmente deseo resetear mi contraseña ahora",
-"Request reset" => "Solicitar restablecimiento",
"Your password was reset" => "Su contraseña fue restablecida",
"To login page" => "A la página de inicio de sesión",
"New password" => "Nueva contraseña",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 13eaf5393634a958191b513ce29eeab917b55b0b..c8974339998b511013b20ea802f10433784d2964 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -92,7 +92,6 @@ $TRANSLATIONS = array(
"Username" => "Nombre de usuario",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
"Yes, I really want to reset my password now" => "Sí, definitivamente quiero restablecer mi contraseña ahora",
-"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:",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 106617f7e11a46991920ebabc016382131351984..9a5fdf59f69ae5cca89dbc359cc50c2d0161274f 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Kasutajanimi",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
"Yes, I really want to reset my password now" => "Jah, ma tõesti soovin oma parooli praegu nullida",
-"Request reset" => "Päringu taastamine",
"Your password was reset" => "Sinu parool on taastatud",
"To login page" => "Sisselogimise lehele",
"New password" => "Uus parool",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 53a522adc7d153e1f4166c9ab18872c783bcf51b..3ad11a62cd80a4be558c500fedc21dd79ed2c623 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -84,7 +84,6 @@ $TRANSLATIONS = array(
"Username" => "Erabiltzaile izena",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
"Yes, I really want to reset my password now" => "Bai, nire pasahitza orain berrabiarazi nahi dut",
-"Request reset" => "Eskaera berrezarri da",
"Your password was reset" => "Zure pasahitza berrezarri da",
"To login page" => "Sarrera orrira",
"New password" => "Pasahitz berria",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index fafc234864029b0c142fc75ff879ee7d3d2bc3f9..6ac124714ebc4f632d7167cc7e9a74478fc71973 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -83,7 +83,6 @@ $TRANSLATIONS = array(
"Username" => "نام کاربری",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
"Yes, I really want to reset my password now" => "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
-"Request reset" => "درخواست دوباره سازی",
"Your password was reset" => "گذرواژه شما تغییرکرد",
"To login page" => "به صفحه ورود",
"New password" => "گذرواژه جدید",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 0c63d410f9b67d3ad346b95c36a01dc0768097af..3462ab5c983bf56abec0a73bb17f7c2e1ac488c4 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -106,7 +106,6 @@ $TRANSLATIONS = array(
"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
"Username" => "Käyttäjätunnus",
"Yes, I really want to reset my password now" => "Kyllä, haluan nollata salasanani nyt",
-"Request reset" => "Tilaus lähetetty",
"Your password was reset" => "Salasanasi nollattiin",
"To login page" => "Kirjautumissivulle",
"New password" => "Uusi salasana",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 4a12cf73a102d44715d4c9ca7ff011337bc41e39..696e3605f2058d57eb855f37a6da5ef028f13eb2 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Nom d'utilisateur",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?",
"Yes, I really want to reset my password now" => "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
-"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",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 3b9fad2687b3b749f2138a2ee0c755bae57d4fe9..d254da9df1407fe68e56fef53a87bfc841df7bc9 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Nome de usuario",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
"Yes, I really want to reset my password now" => "Si, confirmo que quero restabelecer agora o meu contrasinal",
-"Request reset" => "Petición de restabelecemento",
"Your password was reset" => "O contrasinal foi restabelecido",
"To login page" => "A páxina de conexión",
"New password" => "Novo contrasinal",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index f2e2a8f01a4835ea75824837a5fc13e80241e799..c8012b53623db68d161142fb0649de8dba2ebb8b 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -81,7 +81,6 @@ $TRANSLATIONS = array(
"You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
"Username" => "שם משתמש",
"Yes, I really want to reset my password now" => "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
-"Request reset" => "בקשת איפוס",
"Your password was reset" => "הססמה שלך אופסה",
"To login page" => "לדף הכניסה",
"New password" => "ססמה חדשה",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index c9aeebe1e0bfe86fda9cd5a07444de76d6aff5d2..e3d157a5139aafd641199277ec697c38804999fb 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -64,7 +64,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}",
"You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
"Username" => "Korisničko ime",
-"Request reset" => "Zahtjev za resetiranjem",
"Your password was reset" => "Vaša lozinka je resetirana",
"To login page" => "Idi na stranicu za prijavu",
"New password" => "Nova lozinka",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 45b3cef6bc6feb6ab83e24ffd559541a7ad4cba1..b55008c48ab78f181da89251b7e94261097d6580 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Felhasználónév",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
"Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam",
-"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ó",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index fce101939e43a2ec2d7ead80f4f7a3912d45ee06..301bb132827871ff30cd921a6f3e9f124a4d4ef1 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -33,7 +33,6 @@ $TRANSLATIONS = array(
"Delete" => "Deler",
"Add" => "Adder",
"Username" => "Nomine de usator",
-"Request reset" => "Requestar reinitialisation",
"Your password was reset" => "Tu contrasigno esseva reinitialisate",
"To login page" => "al pagina de initio de session",
"New password" => "Nove contrasigno",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 09b72873cd9772706325ecc445d946904f552238..aca262a8f3017c0348d5b1284840f1282b439757 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -77,7 +77,6 @@ $TRANSLATIONS = array(
"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",
-"Request reset" => "Ajukan penyetelan ulang",
"Your password was reset" => "Sandi Anda telah disetel ulang",
"To login page" => "Ke halaman masuk",
"New password" => "Sandi baru",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index ac57060c641a4caa0bc7e8772a4b74438ec907e7..d90669ac8d65e3ed62367bfff91563f8a4a1d0dd 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -75,7 +75,6 @@ $TRANSLATIONS = array(
"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ð.",
"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ð",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 49e0dd232f0770573ca56b7a8e8e15dd8befdb38..eeefece2868d77e31e91551797fdb59691a0d78f 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Nome utente",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
"Yes, I really want to reset my password now" => "Sì, voglio davvero ripristinare la mia password adesso",
-"Request reset" => "Richiesta di ripristino",
"Your password was reset" => "La password è stata ripristinata",
"To login page" => "Alla pagina di accesso",
"New password" => "Nuova password",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 0b647d615a68c9e6cca7f87c8029422bd56d2188..fa89fbddbbaee4d6825732eb0e87ec23ec5a3e6c 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "ユーザー名",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "ファイルが暗号化されています。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
"Yes, I really want to reset my password now" => "はい、今すぐパスワードをリセットします。",
-"Request reset" => "リセットを要求します。",
"Your password was reset" => "あなたのパスワードはリセットされました。",
"To login page" => "ログインページへ戻る",
"New password" => "新しいパスワードを入力",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 80a071081221bc0242ceeb5951405bf517aa9416..38f4f9536d45cc9a0ce485bf6aa1933ff2f35b3d 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -77,7 +77,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
"You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
"Username" => "მომხმარებლის სახელი",
-"Request reset" => "პაროლის შეცვლის მოთხოვნა",
"Your password was reset" => "თქვენი პაროლი შეცვლილია",
"To login page" => "შესვლის გვერდზე",
"New password" => "ახალი პაროლი",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index fda9a89bf2e44c6b1ebbb714721416ba68cc208c..280cd744edf1ae4396d095b8e45a49463c6b6f1e 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -80,7 +80,6 @@ $TRANSLATIONS = array(
"You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.",
"Username" => "사용자 이름",
"Yes, I really want to reset my password now" => "네, 전 제 비밀번호를 리셋하길 원합니다",
-"Request reset" => "요청 초기화",
"Your password was reset" => "암호가 재설정되었습니다",
"To login page" => "로그인 화면으로",
"New password" => "새 암호",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 9a9ebea399555cf39fc7411a40b264f6d5669ab5..090baaf79e28fd2946004ef99f62381880dc0999 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -83,7 +83,6 @@ $TRANSLATIONS = array(
"Username" => "Benotzernumm",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
"Yes, I really want to reset my password now" => "Jo, ech wëll mäi Passwuert elo zrécksetzen",
-"Request reset" => "Zrécksetzung ufroen",
"Your password was reset" => "Däi Passwuert ass zréck gesat ginn",
"To login page" => "Bei d'Login-Säit",
"New password" => "Neit Passwuert",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index ca727d1dadc36d0b91c1db6fee2db5c0738c0bfe..f7fc7203bb8f62aafe28ea966fd1bf768dba0f95 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Prisijungimo vardas",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
"Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį",
-"Request reset" => "Prašyti nustatymo iš najo",
"Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo",
"To login page" => "Į prisijungimo puslapį",
"New password" => "Naujas slaptažodis",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index faf96431e027ff2cb3780f767b47d5ca2efb738a..ed0d1d1ac4c9db127b0f3658e1bcd2d322d9f88f 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -84,7 +84,6 @@ $TRANSLATIONS = array(
"Username" => "Lietotājvārds",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
"Yes, I really want to reset my password now" => "Jā, Es tiešām vēlos mainīt savu paroli",
-"Request reset" => "Pieprasīt paroles maiņu",
"Your password was reset" => "Jūsu parole tika nomainīta",
"To login page" => "Uz ielogošanās lapu",
"New password" => "Jauna parole",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 1ebdab04e7b5a4e292004dbbda95e74745809501..62d319a65ea4f649a0a5821ce015ef5294dc8dba 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -97,7 +97,6 @@ $TRANSLATIONS = array(
"You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
"Username" => "Корисничко име",
"Yes, I really want to reset my password now" => "Да, јас сега навистина сакам да ја поништам својата лозинка",
-"Request reset" => "Побарајте ресетирање",
"Your password was reset" => "Вашата лозинка беше ресетирана",
"To login page" => "Кон страницата за најава",
"New password" => "Нова лозинка",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 9d30010e6ceba2a122de91bf40b69ad65783559d..c0a50be4f2ce15d0f9c67067c154eae069d4cd33 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -38,7 +38,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
"You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
"Username" => "Nama pengguna",
-"Request reset" => "Permintaan set semula",
"Your password was reset" => "Kata laluan anda telah diset semula",
"To login page" => "Ke halaman log masuk",
"New password" => "Kata laluan baru",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index a103ebead7f4498070c4cd6664bcbdb3fdd38d20..4fd88e4a040f3c6a90b102f05c5c2b39d662c73a 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -68,7 +68,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
"You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
"Username" => "Brukernavn",
-"Request reset" => "Anmod tilbakestilling",
"Your password was reset" => "Passordet ditt ble tilbakestilt",
"To login page" => "Til innlogginssiden",
"New password" => "Nytt passord",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index aaac72355dd70be775f81bf9870c0b85c33506ad..e4b75ee1ad0c060275ce3afa206e095588c04fc2 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
"Username" => "Gebruikersnaam",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?",
"Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten",
-"Request reset" => "Resetaanvraag",
"Your password was reset" => "Je wachtwoord is gewijzigd",
"To login page" => "Naar de login-pagina",
"New password" => "Nieuw wachtwoord",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index af42b3a9bdfc8e5e1488a3bd00de0d69950ace76..0221c3945fcc1a523973d2bbb4ad9114508441ab 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -104,7 +104,6 @@ $TRANSLATIONS = array(
"Username" => "Brukarnamn",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
"Yes, I really want to reset my password now" => "Ja, eg vil nullstilla passordet mitt no",
-"Request reset" => "Be om nullstilling",
"Your password was reset" => "Passordet ditt er nullstilt",
"To login page" => "Til innloggingssida",
"New password" => "Nytt passord",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 8f1dec5636c4cbdd40aba1a74bacf4a6c9faf7df..f5016757bc623a5639cc36e7b95b6c4c29c4f067 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -65,7 +65,6 @@ $TRANSLATIONS = array(
"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",
-"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",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index b92fdd69d56ca874932a604fb9d901b996af46ca..9d263cdb47db12806b504c1496d54542a970c670 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -102,7 +102,6 @@ $TRANSLATIONS = array(
"Username" => "Nazwa użytkownika",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
"Yes, I really want to reset my password now" => "Tak, naprawdę chcę zresetować hasło teraz",
-"Request reset" => "Żądanie resetowania",
"Your password was reset" => "Zresetowano hasło",
"To login page" => "Do strony logowania",
"New password" => "Nowe hasło",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index f5970189698eb44b5a6223c50a60d294f4684a12..3f36599d7e566142d4bbab5e5bd87a3f015667f1 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Nome de usuário",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer, por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
"Yes, I really want to reset my password now" => "Sim, realmente quero criar uma nova senha.",
-"Request reset" => "Pedir redefinição",
"Your password was reset" => "Sua senha foi redefinida",
"To login page" => "Para a página de login",
"New password" => "Nova senha",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index abe203b571a173b82af800af95431aee0be741d7..69b431190a0ac20e4b607319e1b0d4ce63d67ec7 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -98,7 +98,6 @@ $TRANSLATIONS = array(
"Username" => "Nome de utilizador",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
"Yes, I really want to reset my password now" => "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
-"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",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index dae599608ca578f1dc66b66ad5c083673d174a57..dda1b75d30681c93467d9ce0e1e0e7692b0b4d8b 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -90,7 +90,6 @@ $TRANSLATIONS = array(
"Username" => "Nume utilizator",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
"Yes, I really want to reset my password now" => "Da, eu chiar doresc să îmi resetez parola acum",
-"Request reset" => "Cerere trimisă",
"Your password was reset" => "Parola a fost resetată",
"To login page" => "Spre pagina de autentificare",
"New password" => "Noua parolă",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 8ca65dd9e6c2bee5bf4b19d0023680e053965f1e..dfdea4115d6cac853f73306574d334df47758bff 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"Username" => "Имя пользователя",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?",
"Yes, I really want to reset my password now" => "Да, я действительно хочу сбросить свой пароль",
-"Request reset" => "Запросить сброс",
"Your password was reset" => "Ваш пароль был сброшен",
"To login page" => "На страницу авторизации",
"New password" => "Новый пароль",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 00372bdfda2ea204bbe28ae3a4c0b1c1e1f72c86..12fc59512dbbffd78e0d9168b97627dae1f89b99 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"Username" => "Meno používateľa",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla Vaše dáta. Ak nie ste si isí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
"Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo",
-"Request reset" => "Požiadať o obnovenie",
"Your password was reset" => "Vaše heslo bolo obnovené",
"To login page" => "Na prihlasovaciu stránku",
"New password" => "Nové heslo",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index a2f029e041a25941768d79fc19f19a95e0bfa7f3..f3c25ef829793e4006626b3cd7e5c2144da3bc71 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -83,7 +83,6 @@ $TRANSLATIONS = array(
"Username" => "Uporabniško ime",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ste prepričani, da želite nadaljevati?",
"Yes, I really want to reset my password now" => "Da, potrjujem ponastavitev gesla",
-"Request reset" => "Zahtevaj ponovno nastavitev",
"Your password was reset" => "Geslo je ponovno nastavljeno",
"To login page" => "Na prijavno stran",
"New password" => "Novo geslo",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 1583827674439528b9fb8bc71ca4c1538791813c..64d51b35a54e3e3d655cc98cf142e1fce38e6ed0 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -89,7 +89,6 @@ $TRANSLATIONS = array(
"Username" => "Përdoruesi",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
"Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani",
-"Request reset" => "Bëj kërkesë për rivendosjen",
"Your password was reset" => "Kodi yt u rivendos",
"To login page" => "Tek faqja e hyrjes",
"New password" => "Kodi i ri",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 0e7451fca2e1a3c013dde04722a411fa4ea6af3d..e5f3f0e6cb6a0d6844e0ee51011b2b1f118b1e67 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -73,7 +73,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
"You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
"Username" => "Корисничко име",
-"Request reset" => "Захтевај ресетовање",
"Your password was reset" => "Ваша лозинка је ресетована",
"To login page" => "На страницу за пријаву",
"New password" => "Нова лозинка",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 30a9e15348ad673b7b74ccb21f0d7d426742ab22..8a27ec15cfd12911f5c8bf4298bf236ccb0e4273 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -75,7 +75,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "Koristite sledeći link za reset lozinke: {link}",
"You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
"Username" => "Korisničko ime",
-"Request reset" => "Zahtevaj resetovanje",
"Your password was reset" => "Vaša lozinka je resetovana",
"To login page" => "Na login stranicu",
"New password" => "Nova lozinka",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index cf9195245b36f8f4457f0daf823d8275f7ee04a4..aeab5e2f6190e9e01c5f3d50c6c9a6e1c28e6cd0 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -82,6 +82,7 @@ $TRANSLATIONS = array(
"Resharing is not allowed" => "Dela vidare är inte tillåtet",
"Shared in {item} with {user}" => "Delad i {item} med {user}",
"Unshare" => "Sluta dela",
+"notify by email" => "informera via e-post",
"can edit" => "kan redigera",
"access control" => "åtkomstkontroll",
"create" => "skapa",
@@ -111,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Användarnamn",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
"Yes, I really want to reset my password now" => "Ja, jag vill verkligen återställa mitt lösenord nu",
-"Request reset" => "Begär återställning",
"Your password was reset" => "Ditt lösenord har återställts",
"To login page" => "Till logginsidan",
"New password" => "Nytt lösenord",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index dd4ef9c09eafda46b5400cda79945437a0f36697..ddd1e524a37d0d05acad39f06f7035baada3ab90 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
"You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
"Username" => "பயனாளர் பெயர்",
-"Request reset" => "கோரிக்கை மீளமைப்பு",
"Your password was reset" => "உங்களுடைய கடவுச்சொல் மீளமைக்கப்பட்டது",
"To login page" => "புகுபதிகைக்கான பக்கம்",
"New password" => "புதிய கடவுச்சொல்",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 487c4a2751e25c4beabf9074c7d145365f2a8e6a..2180a6efa730cd643bf4b3b98ac14b84ed75ef02 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -77,7 +77,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
"You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
"Username" => "ชื่อผู้ใช้งาน",
-"Request reset" => "ขอเปลี่ยนรหัสใหม่",
"Your password was reset" => "รหัสผ่านของคุณถูกเปลี่ยนเรียบร้อยแล้ว",
"To login page" => "ไปที่หน้าเข้าสู่ระบบ",
"New password" => "รหัสผ่านใหม่",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 5468e220f651e070d483c35c943edcad6b557bf3..203a7d24eea710b1da6174d14e1f234777e7d416 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
"Username" => "Kullanıcı Adı",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını aktif etmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile irtibata geçiniz. Gerçekten devam etmek istiyor musunuz?",
"Yes, I really want to reset my password now" => "Evet,Şu anda parolamı sıfırlamak istiyorum.",
-"Request reset" => "Sıfırlama iste",
"Your password was reset" => "Parolanız sıfırlandı",
"To login page" => "Giriş sayfasına git",
"New password" => "Yeni parola",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index f3e56730d4a49b848fae092eee5c39042ec5d8ce..bc143494027c0073dc845bb56919d64488098e85 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -77,7 +77,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}",
"You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
"Username" => "Ім'я користувача",
-"Request reset" => "Запит скидання",
"Your password was reset" => "Ваш пароль був скинутий",
"To login page" => "До сторінки входу",
"New password" => "Новий пароль",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 1981e756e477195255f4fb30830a2cdb31e075cb..ed090fdaf787f806ddc9b1517b2667ec599277e8 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔ {link}",
"You will receive a link to reset your password via Email." => "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
"Username" => "یوزر نیم",
-"Request reset" => "ری سیٹ کی درخواست کریں",
"Your password was reset" => "آپ کا پاسورڈ ری سیٹ کر دیا گیا ہے",
"To login page" => "لاگ ان صفحے کی طرف",
"New password" => "نیا پاسورڈ",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 7860d486889c3cd4d7fdbbda64a0a803ef093a31..06decc3a0cb8312aa1b63081f094323dca96f737 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -79,7 +79,6 @@ $TRANSLATIONS = array(
"Request failed!<br>Did you make sure your email/username was right?" => "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?",
"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",
-"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",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 579318afd3697d76f49b23cab5a83c4c619596e3..b46b5151295a3124c9f5427579f4f3fe4cacabfc 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -92,7 +92,6 @@ $TRANSLATIONS = array(
"Username" => "用户名",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？",
"Yes, I really want to reset my password now" => "使得，我真的要现在重设密码",
-"Request reset" => "请求重置",
"Your password was reset" => "您的密码已重置",
"To login page" => "到登录页面",
"New password" => "新密码",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 02cabf847efcb2ed57a3c57e05fe4981b03090f4..809bd7de92cd7304d80b1175ade0ec0999c74289 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -62,7 +62,6 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}",
"You will receive a link to reset your password via Email." => "你將收到一封電郵",
"Username" => "用戶名稱",
-"Request reset" => "重設",
"Your password was reset" => "你的密碼已被重設",
"To login page" => "前往登入版面",
"New password" => "新密碼",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 256034b22eb49b017a8fcde41d40a32f0c68be43..e7406688a142bda9d853c55cf6f3c0509c94da68 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -105,7 +105,6 @@ $TRANSLATIONS = array(
"Username" => "使用者名稱",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？",
"Yes, I really want to reset my password now" => "對，我現在想要重設我的密碼。",
-"Request reset" => "請求重設",
"Your password was reset" => "您的密碼已重設",
"To login page" => "至登入頁面",
"New password" => "新密碼",
diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css
new file mode 100644
index 0000000000000000000000000000000000000000..85cce9f940790e1b4209a30e20bee763251bafe0
--- /dev/null
+++ b/core/lostpassword/css/lostpassword.css
@@ -0,0 +1,36 @@
+#body-login
+input[type="text"],
+input[type="submit"] {
+ margin: 5px 0;
+}
+
+input[type="text"]#user{
+ padding-right: 12px;
+ padding-left: 41px;
+}
+
+#body-login
+input[type="submit"] {
+ text-align: center;
+ width: 170px;
+ height: 45px;
+ padding-top: 7px;
+ padding-bottom: 7px;
+}
+
+#body-login input[type="submit"]#submit {
+ width: 280px;
+}
+
+#body-login .update {
+ text-align: left;
+}
+
+#body-login .update,
+#body-login .error {
+ margin: 10px 0 5px 0;
+}
+
+#user {
+ width: 226px !important;
+}
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index f5fdb1fb2b3919fe88943ee8c0fcf40eeeb3d285..83a23f7b23931dd5bf5a277eb59c2918422a6add 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,5 +1,8 @@
-<?php if ($_['requested']): ?>
- <div class="success"><p>
+<?php
+//load the file we need
+OCP\Util::addStyle('lostpassword', 'lostpassword');
+ if ($_['requested']): ?>
+ <div class="update"><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 .'));
?>
@@ -8,11 +11,11 @@
<form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post">
<fieldset>
<?php if ($_['error']): ?>
- <div class="errors"><p>
+ <div class="error"><p>
<?php print_unescaped($l->t('Request failed!<br>Did you make sure your email/username was right?')); ?>
</p></div>
<?php endif; ?>
- <?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?>
+ <div class="update"><?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?></div>
<p class="infield">
<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>
@@ -24,7 +27,7 @@
<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/>
<?php endif; ?>
</p>
- <input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
+ <input type="submit" id="submit" value="<?php print_unescaped($l->t('Reset')); ?>" />
</fieldset>
</form>
<?php endif; ?>
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index b23ed88e206b9bcedd7fe159eed303bb3b5afdcb..e93c2d99093872132280c59881e47001dde5593a 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index e7828bdc0eb69e34e0661401d5534b3764098720..fd1468bc7dc7c8d76164bbd42e6172bb74e2d366 100644
--- a/l10n/ady/core.po
+++ b/l10n/ady/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-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/af/core.po b/l10n/af/core.po
index c2dc749096657576f3281d92786464d69cc6b5e0..c9e47a9c5c6d56ddb67a59667117bc5de1a07695 100644
--- a/l10n/af/core.po
+++ b/l10n/af/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-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index d9d368bd8e046342bde8894828b30bf7a6914736..4eb90f4d2c4a6e55c812694eba7e7fbcfc7bdaf9 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Wagwoord"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ 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
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Gebruikersnaam"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,13 +489,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Herstel-versoek"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 4cdc53296621467d3953b429d28a8ac2091abaca..11e89311ad32e36a687d684376f560131046fd6e 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -297,140 +297,140 @@ msgstr "مشارك"
msgid "Share"
msgstr "شارك"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "خطأ"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "حصل خطأ عند عملية المشاركة"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "حصل خطأ عند عملية إزالة المشاركة"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "شورك معك ومع المجموعة {group} من قبل {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "شورك معك من قبل {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "حماية كلمة السر"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "كلمة المرور"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "ارسل الرابط بالبريد الى صديق"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "أرسل"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "تعيين تاريخ إنتهاء الصلاحية"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "تاريخ إنتهاء الصلاحية"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "مشاركة عبر البريد الإلكتروني:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "لم يتم العثور على أي شخص"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "مجموعة"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "لا يسمح بعملية إعادة المشاركة"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "شورك في {item} مع {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "إلغاء مشاركة"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "التحرير مسموح"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "ضبط الوصول"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "إنشاء"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "تحديث"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "حذف"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "مشاركة"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "محمي بكلمة السر"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "جاري الارسال ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "تم ارسال البريد الالكتروني"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "تحذير"
@@ -482,27 +482,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "وصلة تحديث كلمة المرور بعثت الى بريدك الالكتروني.<br> اذا لم تستقبل البريد خلال فترة زمنية قصيره, ابحث في سلة مهملات بريدك."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "الطلب رفض! <br> هل انت متأكد أن الاسم/العنوان البريدي صحيح؟"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "إسم المستخدم"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -510,13 +510,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "طلب تعديل"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 20443e833bbc571ac995c3162af4f7aece53633a..7be33415f4a9d15b29aa5a552b1ec4559e8b57f4 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-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -286,140 +286,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -471,27 +471,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -499,12 +499,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index f099c3e2ffdac7668fe8dd41112f1db37617a185..d65dbc636674246cf21417becf9a47d6e42a0fac 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr "Споделяне"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Грешка"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Парола"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "създаване"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Внимание"
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "Ще получите връзка за нулиране на паролата Ви."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Потребител"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,13 +489,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Нулиране на заявка"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 701325841313a4d18a5c920970fc4d9521a02323..a6674c96bc5635d2f74680caf751d36e178b17cb 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr "ভাগাভাগিকৃত"
msgid "Share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "সমস্যা"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে "
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "অনুমতিসমূহ পরিবর্তন করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} আপনার সাথে ভাগাভাগি করেছেন"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "কূটশব্দ সুরক্ষিত"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "কূটশব্দ"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "ব্যক্তির সাথে ই-মেইল যুক্ত কর"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "পাঠাও"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "ই-মেইলের মাধ্যমে ভাগাভাগি করুনঃ"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "কোন ব্যক্তি খুঁজে পাওয়া গেল না"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "পূনঃরায় ভাগাভাগি অনুমোদিত নয়"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "ভাগাভাগি বাতিল "
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "সম্পাদনা করতে পারবেন"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "অধিগম্যতা নিয়ন্ত্রণ"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "তৈরী করুন"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "পরিবর্ধন কর"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "মুছে ফেল"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "কূটশব্দদ্বারা সুরক্ষিত"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "পাঠানো হচ্ছে......"
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "ই-মেইল পাঠানো হয়েছে"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "সতর্কবাণী"
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "আপনার কূটশব্দটি পূনঃনির্ধারণ করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "ব্যবহারকারী"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,13 +489,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "অনুরোধ পূনঃনির্ধারণ"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 6ef3a7c1a7462db1c49b31a93341b42226e30698..e22879aaa3bcbd6a7d2740f48ef1980510061b14 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: bs\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/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -281,140 +281,140 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -466,27 +466,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -494,12 +494,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index d4eaf16acadefb055d2d9961400eee0de812404b..223d386553eebe7c5b01977a635ce9180b01fa9b 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 11:40+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ha compartit »%s« amb tu"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No s'ha pogut enviar correu als usuaris següents: %s"
@@ -278,140 +278,140 @@ msgstr "Compartit"
msgid "Share"
msgstr "Comparteix"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Error"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Error en compartir"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Error en deixar de compartir"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Error en canviar els permisos"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartit amb vos i amb el grup {group} per {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Compartit amb vos per {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Comparteix amb usuari o grup..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Enllaç de compartició"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Protegir amb contrasenya"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Contrasenya"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Permet pujada pública"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Enllaç per correu electrónic amb la persona"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Envia"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Estableix la data de venciment"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Data de venciment"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Comparteix per correu electrònic"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "No s'ha trobat ningú"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grup"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "No es permet compartir de nou"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Compartit en {item} amb {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Deixa de compartir"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "notifica per correu electrònic"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "pot editar"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "control d'accés"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "crea"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "actualitza"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "elimina"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "comparteix"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protegeix amb contrasenya"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Error en eliminar la data de venciment"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Error en establir la data de venciment"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Enviant..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "El correu electrónic s'ha enviat"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Avís"
@@ -463,27 +463,27 @@ msgstr "restableix la contrasenya %s"
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
+#: lostpassword/templates/lostpassword.php: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 "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu.<br>Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és correcte?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nom d'usuari"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -491,13 +491,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Sí, vull restablir ara la contrasenya"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Sol·licita reinicialització"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index ea6157c06a8db40886a047d4d85f30e7e98764b4..fe55df395e4270c4e48b4765b0a54358dba51bfa 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -23,12 +23,12 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s s vámi sdílí »%s«"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nebylo možné odeslat e-mail následujícím uživatelům: %s"
@@ -287,140 +287,140 @@ msgstr "Sdílené"
msgid "Share"
msgstr "Sdílet"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Chyba"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Chyba při sdílení"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Chyba při rušení sdílení"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Chyba při změně oprávnění"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "S Vámi a skupinou {group} sdílí {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "S Vámi sdílí {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Chránit heslem"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Heslo"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Povolit veřejné nahrávání"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Odeslat osobě odkaz e-mailem"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Odeslat"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Nastavit datum vypršení platnosti"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Datum vypršení platnosti"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Sdílet e-mailem:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Žádní lidé nenalezeni"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "skupina"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Sdílení již sdílené položky není povoleno"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Sdíleno v {item} s {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Zrušit sdílení"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "lze upravovat"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "řízení přístupu"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "vytvořit"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "aktualizovat"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "smazat"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "sdílet"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Chráněno heslem"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Chyba při odstraňování data vypršení platnosti"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Chyba při nastavení data vypršení platnosti"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Odesílám ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-mail odeslán"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Varování"
@@ -472,27 +472,27 @@ msgstr "reset hesla %s"
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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
msgid "You will receive a link to reset your password via Email."
msgstr "E-mailem Vám bude zaslán odkaz pro obnovu hesla."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Uživatelské jméno"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -500,13 +500,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Ano, opravdu si nyní přeji obnovit mé heslo"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Vyžádat obnovu"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index b4c57f73e73381f9e27506c8de31b1bbae23a3d6..69fbdde96df6dc5770db20816c49724dff721a39 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -287,140 +287,140 @@ msgstr "Rhannwyd"
msgid "Share"
msgstr "Rhannu"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Gwall"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Gwall wrth rannu"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Gwall wrth ddad-rannu"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Gwall wrth newid caniatâd"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Rhannwyd â chi a'r grŵp {group} gan {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Rhannwyd â chi gan {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Diogelu cyfrinair"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Cyfrinair"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "E-bostio dolen at berson"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Anfon"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Gosod dyddiad dod i ben"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Dyddiad dod i ben"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Rhannu drwy e-bost:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Heb ganfod pobl"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grŵp"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Does dim hawl ail-rannu"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Rhannwyd yn {item} â {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Dad-rannu"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "yn gallu golygu"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "rheolaeth mynediad"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "creu"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "diweddaru"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "dileu"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "rhannu"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Diogelwyd â chyfrinair"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Gwall wrth osod dyddiad dod i ben"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Yn anfon ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Anfonwyd yr e-bost"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Rhybudd"
@@ -472,27 +472,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost."
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Enw defnyddiwr"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -500,13 +500,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Gwneud cais i ailosod"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index cb0c489275aab1ea6fe89aecbe7331ae0123b992..724078260cb8e9dde3075909d57c24325f31014a 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +21,12 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s delte »%s« med sig"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -280,140 +280,140 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Fejl"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Fejl under deling"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Fejl under annullering af deling"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Fejl under justering af rettigheder"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delt med dig og gruppen {group} af {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Delt med dig af {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Beskyt med adgangskode"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Kodeord"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Tillad Offentlig Upload"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "E-mail link til person"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Send"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Vælg udløbsdato"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Udløbsdato"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Del via email:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Ingen personer fundet"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "gruppe"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Videredeling ikke tilladt"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Fjern deling"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "kan redigere"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "Adgangskontrol"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "opret"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "opdater"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "slet"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "del"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Beskyttet med adgangskode"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Fejl ved fjernelse af udløbsdato"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Fejl under sætning af udløbsdato"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sender ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-mail afsendt"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Advarsel"
@@ -465,27 +465,27 @@ msgstr "%s adgangskode nulstillet"
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
+#: lostpassword/templates/lostpassword.php: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 "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam / junk mapper.<br> Hvis det ikke er der, så spørg din lokale administrator."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Brugernavn"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -493,13 +493,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Ja, Jeg ønsker virkelig at nulstille mit kodeord"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Anmod om nulstilling"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 4eae5dd5b4f369b22fe46de22be07a668b04136d..5716903c04925fe0342b6633124cf1d58a345238 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s teilte »%s« mit Ihnen"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s"
@@ -284,140 +284,140 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Fehler"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Fehler beim Aufheben der Freigabe"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Fehler beim Ändern der Rechte"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} hat dies mit Dir geteilt"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Mit Benutzer oder Gruppe teilen ...."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Link Teilen"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Passwort"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Senden"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Setze ein Ablaufdatum"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Über eine E-Mail teilen:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "Gruppe"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Weiterverteilen ist nicht erlaubt"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Für {user} in {item} freigegeben"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "Per E-Mail informieren"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "erstellen"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "löschen"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "teilen"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Durch ein Passwort geschützt"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-Mail wurde verschickt"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Warnung"
@@ -469,27 +469,27 @@ msgstr "%s-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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Benutzername"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -497,13 +497,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Ja, ich will mein Passwort jetzt wirklich zurücksetzen"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Beantrage Zurücksetzung"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index cd2ad1df09e1bdad89f25cff7423c781abc0d405..eec0ad8fabe3114faf1def9107edb01e1ae771bc 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
"Language: de_AT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -277,140 +277,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -462,27 +462,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,12 +490,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index d3ef2b06edd52d4907b8a875aaab64ce61f1bcb7..cba478476c017fac2e6b01c90f68b946945ca43a 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -26,12 +26,12 @@ msgstr ""
"Language: de_CH\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s teilt »%s« mit Ihnen"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -285,140 +285,140 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Fehler"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Fehler beim Aufheben der Freigabe"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Fehler bei der Änderung der Rechte"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Von {owner} mit Ihnen geteilt."
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Passwort"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Senden"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Ein Ablaufdatum setzen"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "Gruppe"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "erstellen"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "löschen"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "teilen"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email gesendet"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Warnung"
@@ -470,27 +470,27 @@ msgstr "%s-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
+#: lostpassword/templates/lostpassword.php: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 "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen 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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Benutzername"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -498,13 +498,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen."
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Zurücksetzung anfordern"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 86a883facc449ad97cfde1dc85074dbdf35a7044..4e79b59f1d1d040b20226466296a4491bd9de978 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s geteilt »%s« mit Ihnen"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s"
@@ -284,140 +284,140 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Fehler"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Fehler beim Aufheben der Freigabe"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Fehler bei der Änderung der Rechte"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Von {owner} mit Ihnen geteilt."
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Mit Benutzer oder Gruppe teilen ...."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Link teilen"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Passwort"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Senden"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Ein Ablaufdatum setzen"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "Gruppe"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "Per E-Mail informieren"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "erstellen"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "löschen"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "teilen"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email gesendet"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Warnung"
@@ -469,27 +469,27 @@ msgstr "%s-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
+#: lostpassword/templates/lostpassword.php: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 "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen 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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Benutzername"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -497,13 +497,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen."
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Zurücksetzung anfordern"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index a6c92575519dfc0800d475cdcc01e541f92a7a84..f63eac7e698d3e193e4e865c6e0d516b4dffdb35 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -25,12 +25,12 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -284,140 +284,140 @@ msgstr "Κοινόχρηστα"
msgid "Share"
msgstr "Διαμοιρασμός"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Σφάλμα"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Σφάλμα κατά τον διαμοιρασμό"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Σφάλμα κατά το σταμάτημα του διαμοιρασμού"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Σφάλμα κατά την αλλαγή των δικαιωμάτων"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Διαμοιράστηκε με σας από τον {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Διαμοιρασμός με χρήστη ή ομάδα ..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Διαμοιρασμός συνδέσμου"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Προστασία συνθηματικού"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Συνθηματικό"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Να επιτρέπεται η Δημόσια Αποστολή"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Αποστολή συνδέσμου με email "
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Αποστολή"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Ορισμός ημ. λήξης"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Ημερομηνία λήξης"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Διαμοιρασμός μέσω email:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Δεν βρέθηκε άνθρωπος"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "ομάδα"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Διαμοιρασμός του {item} με τον {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Σταμάτημα διαμοιρασμού"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "ειδοποίηση με email"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "δυνατότητα αλλαγής"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "έλεγχος πρόσβασης"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "δημιουργία"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "ενημέρωση"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "διαγραφή"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "διαμοιρασμός"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Προστασία με συνθηματικό"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Αποστολή..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Το Email απεστάλη "
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Προειδοποίηση"
@@ -469,27 +469,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "Ο σύνδεσμος για να επανακτήσετε τον κωδικό σας έχει σταλεί στο email <br>αν δεν το λάβετε μέσα σε ορισμένο διάστημα, ελέγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί ρωτήστε τον τοπικό σας διαχειριστή "
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
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:18
msgid "You will receive a link to reset your password via Email."
msgstr "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Όνομα χρήστη"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -497,13 +497,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα."
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Επαναφορά αίτησης"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 5c81b308404094aef28b595eefeebe46f27db641..2405df4dcd12a5e47e11d65d7e4cdb9d75d776b5 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -277,140 +277,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Passcode"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -462,27 +462,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,12 +490,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 782bfc8686a0dcf92b65174a24dc23eb114b4fe2..ca370d21c9a37eb4bc088d137894c5fc3bdb0a1d 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 14:10+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,12 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s shared \"%s\" with you"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Couldn't send mail to following users: %s "
@@ -277,140 +277,140 @@ msgstr "Shared"
msgid "Share"
msgstr "Share"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Error"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Error whilst sharing"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Error whilst unsharing"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Error whilst changing permissions"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Shared with you and the group {group} by {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Shared with you by {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Share with user or group …"
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Share link"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Password protect"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Password"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Allow Public Upload"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Email link to person"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Send"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Set expiration date"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Expiration date"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Share via email:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "No people found"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "group"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Resharing is not allowed"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Shared in {item} with {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Unshare"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "notify by email"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "can edit"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "access control"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "create"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "update"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "delete"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "share"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Password protected"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Error unsetting expiration date"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sending ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email sent"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Warning"
@@ -462,27 +462,27 @@ msgstr "%s password reset"
msgid "Use the following link to reset your password: {link}"
msgstr "Use the following link to reset your password: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "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:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Request failed!<br>Did you make sure your email/username was correct?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "You will receive a link to reset your password via email."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Username"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,13 +490,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Yes, I really want to reset my password now"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 0aace54d5ae99f8a6457656446401787c13f2367..e81b47c0c93ee2f23c4b8bbb616912a2e53cd0b6 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s kunhavigis “%s” kun vi"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -278,140 +278,140 @@ msgstr "Dividita"
msgid "Share"
msgstr "Kunhavigi"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Eraro"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Eraro dum kunhavigo"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Eraro dum malkunhavigo"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Eraro dum ŝanĝo de permesoj"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Kunhavigita kun vi kaj la grupo {group} de {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Kunhavigita kun vi de {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Protekti per pasvorto"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Pasvorto"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Retpoŝti la ligilon al ulo"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Sendi"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Agordi limdaton"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Limdato"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Kunhavigi per retpoŝto:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Ne troviĝis gento"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupo"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Rekunhavigo ne permesatas"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Kunhavigita en {item} kun {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Malkunhavigi"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "povas redakti"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "alirkontrolo"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "krei"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "ĝisdatigi"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "forigi"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "kunhavigi"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protektita per pasvorto"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Eraro dum malagordado de limdato"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Eraro dum agordado de limdato"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sendante..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "La retpoŝtaĵo sendiĝis"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Averto"
@@ -463,27 +463,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Uzantonomo"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -491,13 +491,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Jes, mi vere volas restarigi mian pasvorton nun"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Peti rekomencigon"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 0593e8e5c632b726bb831583f3b75bff888d5fcd..27247f8cc39f9d817d04e4656a2adaf29e875908 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -19,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -29,12 +29,12 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ha compatido »%s« contigo"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No se pudo enviar el mensaje a los siguientes usuarios: %s"
@@ -288,140 +288,140 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Error"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Error al compartir"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Error al dejar de compartir"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Error al cambiar permisos"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido contigo y el grupo {group} por {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Compartido contigo por {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Compartido con el usuario o con el grupo ..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Enlace compartido"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Protección con contraseña"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Contraseña"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Enviar enlace por correo electrónico a una persona"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Enviar"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Establecer fecha de caducidad"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Fecha de caducidad"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Compartir por correo electrónico:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "No se encontró gente"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupo"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "No se permite compartir de nuevo"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "notificar al usuario por correo electrónico"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "crear"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "actualizar"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "eliminar"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "compartir"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protegido con contraseña"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Error eliminando fecha de caducidad"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Error estableciendo fecha de caducidad"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Correo electrónico enviado"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Precaución"
@@ -473,27 +473,27 @@ msgstr "%s restablecer contraseña"
msgid "Use the following link to reset your password: {link}"
msgstr "Utilice el siguiente enlace para restablecer su contraseña: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "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 carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nombre de usuario"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -501,13 +501,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Sí. Realmente deseo resetear mi contraseña ahora"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Solicitar restablecimiento"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index ef3513994b2567c9b9b58739d6168b4c34f90ad5..c27f8f0a552918437e4f63101e9934cd43fd5f20 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s compartió \"%s\" con vos"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -277,140 +277,140 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Error"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Error al compartir"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Error en al dejar de compartir"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Error al cambiar permisos"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido con vos y el grupo {group} por {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Compartido con vos por {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Proteger con contraseña "
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Contraseña"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Enviar el enlace por e-mail."
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Mandar"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Asignar fecha de vencimiento"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Fecha de vencimiento"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Compartir a través de e-mail:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "No se encontraron usuarios"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupo"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "No se permite volver a compartir"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "podés editar"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "crear"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "actualizar"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "borrar"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "compartir"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protegido por contraseña"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Error al remover la fecha de vencimiento"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Error al asignar fecha de vencimiento"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Mandando..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "e-mail mandado"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Atención"
@@ -462,27 +462,27 @@ msgstr "%s restablecer contraseña"
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
+#: lostpassword/templates/lostpassword.php: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 "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable, revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nombre de usuario"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,13 +490,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Sí, definitivamente quiero restablecer mi contraseña ahora"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Solicitar restablecimiento"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index 3dbb58f3010b7fc9ffb6a5dd20f9b9dc11216491..c1aa5e04d015767577cdd9bb4396340b5801bf49 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index f2d168b1c158aaba50dd5f626613ca24438f0828..b1c88bf45ae550c6bf84ef0a5540c44d2c763269 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s jagas sinuga »%s«"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s "
@@ -278,140 +278,140 @@ msgstr "Jagatud"
msgid "Share"
msgstr "Jaga"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Viga"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Viga jagamisel"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Viga jagamise lõpetamisel"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Viga õiguste muutmisel"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Jagatud sinu ja {group} grupiga {owner} poolt"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Sinuga jagas {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Jaga kasutaja või grupiga ..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Jaga linki"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Parooliga kaitstud"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Parool"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Luba avalik üleslaadimine"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Saada link isikule e-postiga"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Saada"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Määra aegumise kuupäev"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Aegumise kuupäev"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Jaga e-postiga:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Ühtegi inimest ei leitud"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupp"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Edasijagamine pole lubatud"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Jagatud {item} kasutajaga {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Lõpeta jagamine"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "teavita e-postiga"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "saab muuta"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "ligipääsukontroll"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "loo"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "uuenda"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "kustuta"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "jaga"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Parooliga kaitstud"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Viga aegumise kuupäeva eemaldamisel"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Viga aegumise kuupäeva määramisel"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Saatmine ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-kiri on saadetud"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Hoiatus"
@@ -463,27 +463,27 @@ msgstr "%s parooli lähtestus"
msgid "Use the following link to reset your password: {link}"
msgstr "Kasuta järgnevat linki oma parooli taastamiseks: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Kasutajanimi"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -491,13 +491,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Jah, ma tõesti soovin oma parooli praegu nullida"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Päringu taastamine"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 9d7611642cfb764ed13c054042bb881c48c39177..269c213c8b2b184fd17bc1a226d3517b7444e6ea 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s-ek »%s« zurekin partekatu du"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -278,140 +278,140 @@ msgstr "Elkarbanatuta"
msgid "Share"
msgstr "Elkarbanatu"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Errorea"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Errore bat egon da elkarbanatzean"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Errore bat egon da elkarbanaketa desegitean"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Errore bat egon da baimenak aldatzean"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner}-k zurekin elkarbanatuta"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Babestu pasahitzarekin"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Pasahitza"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Gaitu igotze publikoa"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Postaz bidali lotura "
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Bidali"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Ezarri muga data"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Muga data"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Elkarbanatu eposta bidez:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Ez da inor aurkitu"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "taldea"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Berriz elkarbanatzea ez dago baimendua"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "{user}ekin {item}-n elkarbanatuta"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Ez elkarbanatu"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "editatu dezake"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "sarrera kontrola"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "sortu"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "eguneratu"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "ezabatu"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "elkarbanatu"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Pasahitzarekin babestuta"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Errorea izan da muga data kentzean"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Errore bat egon da muga data ezartzean"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Bidaltzen ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Eposta bidalia"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Abisua"
@@ -463,27 +463,27 @@ msgstr "%s 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
+#: lostpassword/templates/lostpassword.php: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 "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Erabiltzaile izena"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -491,13 +491,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Bai, nire pasahitza orain berrabiarazi nahi dut"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Eskaera berrezarri da"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index cc2bb0f08fb5ebe2eb4bfbc82c601cacc0aedb9b..05df67406c1feebe32da7bc51717f94b5edb7309 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -272,140 +272,140 @@ msgstr "اشتراک گذاشته شده"
msgid "Share"
msgstr "اشتراکگذاری"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "خطا"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "خطا درحال به اشتراک گذاشتن"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "خطا درحال لغو اشتراک"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "خطا در حال تغییر مجوز"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "به اشتراک گذاشته شده با شما توسط { دارنده}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "نگهداری کردن رمز عبور"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "گذرواژه"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "اجازه آپلود عمومی"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "پیوند ایمیل برای شخص."
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "ارسال"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "تنظیم تاریخ انقضا"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "تاریخ انقضا"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "از طریق ایمیل به اشتراک بگذارید :"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "کسی یافت نشد"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "گروه"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "لغو اشتراک"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "می توان ویرایش کرد"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "کنترل دسترسی"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "ایجاد"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "به روز"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "پاک کردن"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "به اشتراک گذاشتن"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "نگهداری از رمز عبور"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "خطا در تنظیم نکردن تاریخ انقضا "
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "خطا در تنظیم تاریخ انقضا"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "درحال ارسال ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "ایمیل ارسال شد"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "اخطار"
@@ -457,27 +457,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "درخواست رد شده است !<br> آیا مطمئن هستید که ایمیل/ نام کاربری شما صحیح میباشد ؟"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "نام کاربری"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -485,13 +485,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم."
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "درخواست دوباره سازی"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 08104c16ace6387c9f70b583dcf716da7910d1d9..973a5b83e66358d9387ee849b8b98ddafd2995cb 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s jakoi kohteen »%s« kanssasi"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s"
@@ -278,140 +278,140 @@ msgstr "Jaettu"
msgid "Share"
msgstr "Jaa"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Virhe"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Virhe jaettaessa"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Virhe jakoa peruttaessa"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Virhe oikeuksia muuttaessa"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Jaettu kanssasi käyttäjän {owner} toimesta"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Jaa käyttäjän tai ryhmän kanssa…"
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Jaa linkki"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Suojaa salasanalla"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Salasana"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Salli julkinen lähetys"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Lähetä linkki sähköpostitse"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Lähetä"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Aseta päättymispäivä"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Päättymispäivä"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Jaa sähköpostilla:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Henkilöitä ei löytynyt"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "ryhmä"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Jakaminen uudelleen ei ole salittu"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "{item} on jaettu {user} kanssa"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Peru jakaminen"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "ilmoita sähköpostitse"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "voi muokata"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "Pääsyn hallinta"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "luo"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "päivitä"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "poista"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "jaa"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Salasanasuojattu"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Virhe purettaessa eräpäivää"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Virhe päättymispäivää asettaessa"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Lähetetään..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Sähköposti lähetetty"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Varoitus"
@@ -463,27 +463,27 @@ msgstr "%s salasanan nollaus"
msgid "Use the following link to reset your password: {link}"
msgstr "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.<br>Jos et saa viestiä pian, tarkista roskapostikansiosi.<br>Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Käyttäjätunnus"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -491,13 +491,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Kyllä, haluan nollata salasanani nyt"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Tilaus lähetetty"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 2c3da3280b62eb7f685e9d79e3f1b99cedcf13a0..ccfe24cfaac16886555718425425b66450c556ad 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 18:10+0000\n"
-"Last-Translator: etiess <etiess@gmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -24,12 +24,12 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s partagé »%s« avec vous"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Impossible d'envoyer un mail aux utilisateurs suivant : %s"
@@ -283,140 +283,140 @@ msgstr "Partagé"
msgid "Share"
msgstr "Partager"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Erreur"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Erreur lors de la mise en partage"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Erreur lors de l'annulation du partage"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Erreur lors du changement des permissions"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Partagé par {owner} avec vous et le groupe {group}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Partagé avec vous par {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Partager avec un utilisateur ou un groupe..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Partager le lien"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Protéger par un mot de passe"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Mot de passe"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Autoriser l'upload par les utilisateurs non enregistrés"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Envoyez le lien par email"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Envoyer"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Spécifier la date d'expiration"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Date d'expiration"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Partager via e-mail :"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Aucun utilisateur trouvé"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "groupe"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Le repartage n'est pas autorisé"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Partagé dans {item} avec {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Ne plus partager"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "Notifier par email"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "édition autorisée"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "contrôle des accès"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "créer"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "mettre à jour"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "supprimer"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "partager"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "En cours d'envoi ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email envoyé"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Attention"
@@ -468,27 +468,27 @@ msgstr "Réinitialisation de votre mot de passe %s"
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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nom d'utilisateur"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -496,13 +496,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Oui, je veux vraiment réinitialiser mon mot de passe maintenant"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Demander la réinitialisation"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index b432b39cf218ece18019afc0c0e607368cc36e70..2a69d434ab364ee4c8b461ffa7addb5543dc1496 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s compartiu «%s» con vostede"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Non é posíbel enviar correo aos usuarios seguintes: %s"
@@ -277,140 +277,140 @@ msgstr "Compartir"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Erro"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Produciuse un erro ao compartir"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Produciuse un erro ao deixar de compartir"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Produciuse un erro ao cambiar os permisos"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido con vostede e co grupo {group} por {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Compartido con vostede por {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Compartir cun usuario ou grupo ..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Ligazón para compartir"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Protexido con contrasinais"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Contrasinal"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Permitir o envío público"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Enviar ligazón por correo"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Enviar"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Definir a data de caducidade"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Data de caducidade"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Compartir por correo:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Non se atopou xente"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupo"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Non se permite volver a compartir"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Deixar de compartir"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "notificar por correo"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "crear"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "actualizar"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "eliminar"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "compartir"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protexido con contrasinal"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Produciuse un erro ao retirar a data de caducidade"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Produciuse un erro ao definir a data de caducidade"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Correo enviado"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Aviso"
@@ -462,27 +462,27 @@ msgstr "Restabelecer o contrasinal %s"
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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nome de usuario"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,13 +490,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Si, confirmo que quero restabelecer agora o meu contrasinal"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Petición de restabelecemento"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 42810970b298f7770680ffaedc5f765f3344b5d9..5aa354ae4ebd7e9a93a50bd9a2c6eb48ea2f57f0 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +19,12 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s שיתף/שיתפה איתך את »%s«"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -278,140 +278,140 @@ msgstr "שותף"
msgid "Share"
msgstr "שתף"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "שגיאה"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "שגיאה במהלך השיתוף"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "שגיאה במהלך ביטול השיתוף"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "שגיאה במהלך שינוי ההגדרות"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "שותף אתך ועם הקבוצה {group} שבבעלות {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "שותף אתך על ידי {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "הגנה בססמה"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "סיסמא"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "שליחת קישור בדוא״ל למשתמש"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "שליחה"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "הגדרת תאריך תפוגה"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "תאריך התפוגה"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "שיתוף באמצעות דוא״ל:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "לא נמצאו אנשים"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "קבוצה"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "אסור לעשות שיתוף מחדש"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "שותף תחת {item} עם {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "הסר שיתוף"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "ניתן לערוך"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "בקרת גישה"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "יצירה"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "עדכון"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "מחיקה"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "שיתוף"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "מוגן בססמה"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "אירעה שגיאה בביטול תאריך התפוגה"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "מתבצעת שליחה ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "הודעת הדוא״ל נשלחה"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "אזהרה"
@@ -463,27 +463,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "הקישור לאיפוס הססמה שלך נשלח אליך בדוא״ל.<br>אם לא קיבלת את הקישור תוך זמן סביר, מוטב לבדוק את תיבת הזבל שלך.<br>אם ההודעה לא שם, כדאי לשאול את מנהל הרשת שלך ."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "הבקשה נכשלה!<br>האם כתובת הדוא״ל/שם המשתמש שלך נכונים?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "שם משתמש"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -491,13 +491,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "כן, אני רוצה לאפס את הסיסמה שלי עכשיו."
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "בקשת איפוס"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 9430716a18cff6990994cf5e5b82541806cd2e09..a1deb749bf239137091c3388fc0cea9dbe32937a 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +19,12 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -278,140 +278,140 @@ msgstr ""
msgid "Share"
msgstr "साझा करें"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "त्रुटि"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "पासवर्ड"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "भेजें"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "कोई व्यक्ति नहीं मिले "
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "भेजा जा रहा है"
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "ईमेल भेज दिया गया है "
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "चेतावनी "
@@ -463,27 +463,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "प्रयोक्ता का नाम"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -491,12 +491,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index e2a0d7859487cf5e399f8825a3e61641fe471760..fd43553cbadcf4018968b67d3305ec9dbd056629 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -281,140 +281,140 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Greška"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Greška prilikom djeljenja"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Greška prilikom isključivanja djeljenja"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Greška prilikom promjena prava"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Zaštiti lozinkom"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Lozinka"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Postavi datum isteka"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Dijeli preko email-a:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Osobe nisu pronađene"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Ponovo dijeljenje nije dopušteno"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Makni djeljenje"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "može mjenjat"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "kreiraj"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "ažuriraj"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "izbriši"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "djeli"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Zaštita lozinkom"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Greška prilikom brisanja datuma isteka"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Greška prilikom postavljanja datuma isteka"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -466,27 +466,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Korisničko ime"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -494,13 +494,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Zahtjev za resetiranjem"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 5536ad9dc29091a8eb778c50208f3106c171495f..68f71634779f708b5226a79fe996966181e92579 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -20,12 +20,12 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s megosztotta Önnel ezt: »%s«"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s"
@@ -279,140 +279,140 @@ msgstr "Megosztott"
msgid "Share"
msgstr "Megosztás"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Hiba"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Nem sikerült létrehozni a megosztást"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Nem sikerült visszavonni a megosztást"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Nem sikerült módosítani a jogosultságokat"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Megosztotta Önnel és a(z) {group} csoporttal: {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Megosztotta Önnel: {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Megosztani egy felhasználóval vagy csoporttal ..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Megosztás hivatkozással"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Jelszóval is védem"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Jelszó"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Feltöltést is engedélyezek"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Email címre küldjük el"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Küldjük el"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Legyen lejárati idő"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "A lejárati idő"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Megosztás emaillel:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Nincs találat"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "csoport"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Megosztva {item}-ben {user}-rel"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "A megosztás visszavonása"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "email értesítés"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "módosíthat"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "jogosultság"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "létrehoz"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "szerkeszt"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "töröl"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "megoszt"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Jelszóval van védve"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Nem sikerült a lejárati időt törölni"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Nem sikerült a lejárati időt beállítani"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Küldés ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Az emailt elküldtük"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Figyelmeztetés"
@@ -464,27 +464,27 @@ msgstr "%s 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
+#: lostpassword/templates/lostpassword.php: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 "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának. <br>Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját. <br>Ha ott sincsen, akkor érdeklődjön a rendszergazdánál."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Felhasználónév"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -492,13 +492,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Igen, tényleg meg akarom változtatni a jelszavam"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Visszaállítás igénylése"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 0ef62a3570f1c26dff952c99606bdad82a65e7fd..6ba07f14a6e0358076e9b5da11e67ba37ecfb2ae 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -17,12 +17,12 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 4165f483be283f835a2a642b1e9489d367913c5b..5b6fc0a369df42dd4027eff38e6c9391a71d9026 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr "Compartir"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Error"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Contrasigno"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Invia"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nomine de usator"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,13 +489,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Requestar reinitialisation"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index afd2280ac91c3f92f3c5cabe0e883d9f9ea6cf15..1c251bfde5f4590bc8d15bc4a29334dacd2b8515 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr "Dibagikan"
msgid "Share"
msgstr "Bagikan"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Galat"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Galat ketika membagikan"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Galat ketika membatalkan pembagian"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Galat ketika mengubah izin"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Dibagikan dengan Anda dan grup {group} oleh {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Dibagikan dengan Anda oleh {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Lindungi dengan sandi"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Sandi"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Emailkan tautan ini ke orang"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Kirim"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Setel tanggal kedaluwarsa"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Tanggal kedaluwarsa"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Bagian lewat email:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Tidak ada orang ditemukan"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grup"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Berbagi ulang tidak diizinkan"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Dibagikan dalam {item} dengan {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Batalkan berbagi"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "dapat mengedit"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "kontrol akses"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "buat"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "perbarui"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "hapus"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "bagikan"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Dilindungi sandi"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Galat ketika menghapus tanggal kedaluwarsa"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Galat ketika menyetel tanggal kedaluwarsa"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Mengirim ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email terkirim"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Peringatan"
@@ -456,27 +456,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nama pengguna"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,13 +484,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Ajukan penyetelan ulang"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index a6e67d0012d52d524a87f869d26ce6b234a05481..9e6e26c3dd4ee527e2d562be43c9272583053032 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -277,140 +277,140 @@ msgstr "Deilt"
msgid "Share"
msgstr "Deila"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Villa"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Villa við deilingu"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Villa við að hætta deilingu"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Villa við að breyta aðgangsheimildum"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Deilt með þér og hópnum {group} af {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Deilt með þér af {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Verja með lykilorði"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Lykilorð"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Senda vefhlekk í tölvupóstu til notenda"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Senda"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Setja gildistíma"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Gildir til"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Deila með tölvupósti:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Engir notendur fundust"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Endurdeiling er ekki leyfð"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Deilt með {item} ásamt {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Hætta deilingu"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "getur breytt"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "aðgangsstýring"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "mynda"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "uppfæra"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "eyða"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "deila"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Verja með lykilorði"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Villa við að aftengja gildistíma"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Villa við að setja gildistíma"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sendi ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Tölvupóstur sendur"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Aðvörun"
@@ -462,27 +462,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Notendanafn"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,13 +490,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Endursetja lykilorð"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index a8d3f2e802b14bc7de5b7987ff782c7af690fe98..c5583ea1880b5fd8181cd2d39214d4076bc7634f 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-29 08:40+0000\n"
-"Last-Translator: polxmod <paolo.velati@gmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -21,12 +21,12 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ha condiviso «%s» con te"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Impossibile inviare email ai seguenti utenti: %s"
@@ -280,140 +280,140 @@ msgstr "Condivisi"
msgid "Share"
msgstr "Condividi"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Errore"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Errore durante la condivisione"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Errore durante la rimozione della condivisione"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Errore durante la modifica dei permessi"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Condiviso con te e con il gruppo {group} da {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Condiviso con te da {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Condividi con utente o gruppo ..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Condividi link"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Proteggi con password"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Password"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Consenti caricamento pubblico"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Invia collegamento via email"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Invia"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Imposta data di scadenza"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Data di scadenza"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Condividi tramite email:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Non sono state trovate altre persone"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "gruppo"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "La ri-condivisione non è consentita"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Condiviso in {item} con {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Rimuovi condivisione"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "notifica via email"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "può modificare"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "controllo d'accesso"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "creare"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "aggiornare"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "elimina"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "condividi"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protetta da password"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Errore durante la rimozione della data di scadenza"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Errore durante l'impostazione della data di scadenza"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Invio in corso..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Messaggio inviato"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Avviso"
@@ -465,27 +465,27 @@ msgstr "Ripristino password di %s"
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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nome utente"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -493,13 +493,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Sì, voglio davvero ripristinare la mia password adesso"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Richiesta di ripristino"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index d44b68c6ce97dcf2330e9822cc00cd2bf9f9cf38..6a4e36c96c608f8bac142b85d4a756e2602d33ce 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -21,12 +21,12 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%sが あなたと »%s«を共有しました"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "次のユーザにメールを送信できませんでした: %s"
@@ -275,140 +275,140 @@ msgstr "共有中"
msgid "Share"
msgstr "共有"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "エラー"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "共有でエラー発生"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "共有解除でエラー発生"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "権限変更でエラー発生"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "あなたと {owner} のグループ {group} で共有中"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} と共有中"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "ユーザもしくはグループと共有 ..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "共有リンク"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "パスワード保護"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "パスワード"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "アップロードを許可"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "メールリンク"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "送信"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "有効期限を設定"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "有効期限"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "メール経由で共有:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "ユーザーが見つかりません"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "グループ"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "再共有は許可されていません"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "{item} 内で {user} と共有中"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "共有解除"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "メールで通知"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "編集を許可"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "アクセス権限"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "作成"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "更新"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "削除"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "共有"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "パスワード保護"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "有効期限の未設定エラー"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "有効期限の設定でエラー発生"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "送信中..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "メールを送信しました"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "警告"
@@ -460,27 +460,27 @@ msgstr "%s パスワードリセット"
msgid "Use the following link to reset your password: {link}"
msgstr "パスワードをリセットするには次のリンクをクリックして下さい: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信出来ない場合は、スパム／迷惑メールフォルダを確認して下さい。<br>もしそこにもない場合は、管理者に問い合わせてください。"
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "リクエストに失敗しました！<br>あなたのメール／ユーザ名が正しいことを確認しましたか？"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "メールでパスワードをリセットするリンクが届きます。"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "ユーザー名"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -488,13 +488,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "ファイルが暗号化されています。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "はい、今すぐパスワードをリセットします。"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "リセットを要求します。"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index 6001cdb4c4a78b4ad68517b1fd71a939707619b1..577db801b7ee8031797498c13fef491ccbd406d5 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "პაროლი"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -456,27 +456,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,12 +484,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 26d904b70ba7eeec37221c6a98f850804e2e0f30..9e013abd1c10d621fb5aead09d5a451e70237272 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr "გაზიარებული"
msgid "Share"
msgstr "გაზიარება"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "შეცდომა"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "შეცდომა გაზიარების დროს"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "შეცდომა გაზიარების გაუქმების დროს"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "შეცდომა დაშვების ცვლილების დროს"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "გაზიარდა თქვენთვის {owner}–ის მიერ"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "პაროლით დაცვა"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "პაროლი"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "ლინკის პიროვნების იმეილზე გაგზავნა"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "გაგზავნა"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "მიუთითე ვადის გასვლის დრო"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "ვადის გასვლის დრო"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "გააზიარე მეილზე"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "მომხმარებელი არ არის ნაპოვნი"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "ჯგუფი"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "გაზიარდა {item}–ში {user}–ის მიერ"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "გაუზიარებადი"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "შეგიძლია შეცვლა"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "დაშვების კონტროლი"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "შექმნა"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "განახლება"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "წაშლა"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "გაზიარება"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "პაროლით დაცული"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "შეცდომა ვადის გასვლის მითითების დროს"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "გაგზავნა ...."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "იმეილი გაიგზავნა"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "გაფრთხილება"
@@ -456,27 +456,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "მომხმარებლის სახელი"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,13 +484,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "პაროლის შეცვლის მოთხოვნა"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/km/core.po b/l10n/km/core.po
index 1341e85c6b26defd63f059725d93ec8d6c2f4a8b..39f046f594c29e57fba1eff51f7e0796e4f5aae2 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -456,27 +456,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,12 +484,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 151f7b2f6015d1bd8323a13f30fb19dd3c094a2c..71c87f4fa6434ab5fe5e4c828470dac9e1bd09e3 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-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -456,27 +456,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,12 +484,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index c4a82b422997435b2910eedff45f1b4cbd4c68a3..4f42ae8f3815ab97de425902513ec1c222deb237 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -273,140 +273,140 @@ msgstr "공유됨"
msgid "Share"
msgstr "공유"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "오류"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "공유하는 중 오류 발생"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "공유 해제하는 중 오류 발생"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "권한 변경하는 중 오류 발생"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} 님이 공유 중"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "암호 보호"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "암호"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "퍼블릭 업로드 허용"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "이메일 주소"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "전송"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "만료 날짜 설정"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "만료 날짜"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "이메일로 공유:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "발견된 사람 없음"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "그룹"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "다시 공유할 수 없습니다"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "{user} 님과 {item}에서 공유 중"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "공유 해제"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "편집 가능"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "접근 제어"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "생성"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "업데이트"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "삭제"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "공유"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "암호로 보호됨"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "만료 날짜 해제 오류"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "만료 날짜 설정 오류"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "전송 중..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "이메일 발송됨"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "경고"
@@ -458,27 +458,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "요청이 실패했습니다!<br>email 주소와 사용자 명을 정확하게 넣으셨나요?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "이메일로 암호 재설정 링크를 보냈습니다."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "사용자 이름"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -486,13 +486,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "네, 전 제 비밀번호를 리셋하길 원합니다"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "요청 초기화"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index c928d9ea2877f4b63ad395bdd7636c9287da4af5..30345a7a0ae40eced3e2b1c5c6aa8a69348a1ed2 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr "هاوبەشی کردن"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "ههڵه"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "وشەی تێپەربو"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "ئاگاداری"
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "ناوی بهکارهێنهر"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 7d6e39483d88dedcc4e764ee8addaf7b11235edf..e4ed8b38713539b3c400192d73300e778da1d51e 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "Den/D' %s huet »%s« mat dir gedeelt"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -277,140 +277,140 @@ msgstr "Gedeelt"
msgid "Share"
msgstr "Deelen"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Feeler"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Feeler beim Deelen"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Feeler beim Annuléiere vum Deelen"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Feeler beim Ännere vun de Rechter"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Gedeelt mat dir an der Grupp {group} vum {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Gedeelt mat dir vum {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Passwuertgeschützt"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Passwuert"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Ëffentlechen Upload erlaaben"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Link enger Persoun mailen"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Schécken"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Verfallsdatum setzen"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Verfallsdatum"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Via E-Mail deelen:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Keng Persoune fonnt"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "Grupp"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Weiderdeelen ass net erlaabt"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Gedeelt an {item} mat {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Net méi deelen"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "kann änneren"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "Zougrëffskontroll"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "erstellen"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "aktualiséieren"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "läschen"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "deelen"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Passwuertgeschützt"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Feeler beim Läsche vum Verfallsdatum"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Feeler beim Setze vum Verfallsdatum"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Gëtt geschéckt..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email geschéckt"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Warnung"
@@ -462,27 +462,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "De Link fir d'Passwuert zréckzesetzen gouf un deng E-Mail-Adress geschéckt.<br>Falls du d'Mail net an den nächste Minutte kriss, kuck w.e.gl. an dengem Spam-Dossier.<br>Wann do och keng Mail ass, fro w.e.gl. däin Adminstrateur."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Ufro feelfeschloen!<br>Hues du séchergestallt dass deng Email respektiv däi Benotzernumm korrekt sinn?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Benotzernumm"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,13 +490,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Jo, ech wëll mäi Passwuert elo zrécksetzen"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Zrécksetzung ufroen"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 8ce236a5ef7ceb305f0c670f0fedcca6bff0c294..373425cb485c4ed0407189163032ff09fe2f63d7 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-29 10:20+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,12 +22,12 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s pasidalino »%s« su tavimi"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nepavyko nusiųsti el. pašto šiems naudotojams: %s "
@@ -286,140 +286,140 @@ msgstr "Dalinamasi"
msgid "Share"
msgstr "Dalintis"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Klaida"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Klaida, dalijimosi metu"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Klaida, kai atšaukiamas dalijimasis"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Klaida, keičiant privilegijas"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Pasidalino su Jumis {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Dalintis su vartotoju arba grupe..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Dalintis nuoroda"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Apsaugotas slaptažodžiu"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Slaptažodis"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Leisti viešą įkėlimą"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Nusiųsti nuorodą paštu"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Siųsti"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Nustatykite galiojimo laiką"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Galiojimo laikas"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Dalintis per el. paštą:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Žmonių nerasta"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupė"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Dalijinasis išnaujo negalimas"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Pasidalino {item} su {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Nebesidalinti"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "pranešti el. paštu"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "gali redaguoti"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "priėjimo kontrolė"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "sukurti"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "atnaujinti"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "ištrinti"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "dalintis"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Apsaugota slaptažodžiu"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Klaida nuimant galiojimo laiką"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Klaida nustatant galiojimo laiką"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Siunčiama..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Laiškas išsiųstas"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Įspėjimas"
@@ -471,27 +471,27 @@ msgstr "%s slaptažodžio atnaujinimas"
msgid "Use the following link to reset your password: {link}"
msgstr "Slaptažodio atkūrimui naudokite šią nuorodą: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "Nuorodą su jūsų slaptažodžio atkūrimu buvo nusiųsta jums į paštą.<br>Jei jo negausite per atitinkamą laiką, pasižiūrėkite brukalo aplankale.<br> Jei jo ir ten nėra, teiraukitės administratoriaus."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Prisijungimo vardas"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -499,13 +499,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Taip, aš tikrai noriu atnaujinti slaptažodį"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Prašyti nustatymo iš najo"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 491e6fa3a94c5ae5b7c320d0e0a3176f3d56f1ba..4e8fdcdc3e7aac61f4a375ef82bf19e4493745e0 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dr. ROX <to.dr.rox@gmail.com>, 2013
# Liudas <liudas@aksioma.lt>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:46+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-29 12:10+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr "Nepavyko pašalinti serverio konfigūracijos"
#: ajax/testConfiguration.php:37
msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Konfigūracija yra tinkama bei prisijungta sėkmingai!"
#: ajax/testConfiguration.php:40
msgid ""
@@ -73,7 +74,7 @@ msgstr "Išlaikyti nustatymus?"
#: js/settings.js:99
msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Negalima pridėti serverio konfigūracijos"
#: js/settings.js:113
msgid "mappings cleared"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 0946c7c22be24f56ddd81b6513d3126b792c8250..e26400dc096b121ac7ef0e85e78d80d57e76387b 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s kopīgots »%s« ar jums"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -282,140 +282,140 @@ msgstr "Kopīgs"
msgid "Share"
msgstr "Dalīties"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Kļūda"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Kļūda, daloties"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Kļūda, beidzot dalīties"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Kļūda, mainot atļaujas"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} dalījās ar jums un grupu {group}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} dalījās ar jums"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Aizsargāt ar paroli"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Parole"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Ļaut publisko augšupielādi."
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Sūtīt saiti personai pa e-pastu"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Sūtīt"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Iestaties termiņa datumu"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Termiņa datums"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Dalīties, izmantojot e-pastu:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Nav atrastu cilvēku"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupa"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Atkārtota dalīšanās nav atļauta"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Dalījās ar {item} ar {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Pārtraukt dalīšanos"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "var rediģēt"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "piekļuves vadība"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "izveidot"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "atjaunināt"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "dzēst"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "dalīties"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Aizsargāts ar paroli"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Kļūda, noņemot termiņa datumu"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Kļūda, iestatot termiņa datumu"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sūta..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Vēstule nosūtīta"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Brīdinājums"
@@ -467,27 +467,27 @@ msgstr "%s 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
+#: lostpassword/templates/lostpassword.php: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 "Saite uz paroles atjaunošanas vietu ir nosūtīta uz epastu.<br>Ja vēstu nav atnākusi, pārbaudiet epasta mēstuļu mapi.<br>Jā tās tur nav, jautājiet sistēmas administratoram."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Pieprasījums neizdevās!<br>Vai Jūs pārliecinājāties ka epasts/lietotājvārds ir pareizi?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Lietotājvārds"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -495,13 +495,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Jā, Es tiešām vēlos mainīt savu paroli"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Pieprasīt paroles maiņu"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index c60d35ce9b77df8c0411bd5ea06bef1a4f2d6fde..3d8ab4debb4f760792bb0e0311a66d7a01de547b 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: miroj <jmiroslav@softhome.net>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,12 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -277,140 +277,140 @@ msgstr "Споделен"
msgid "Share"
msgstr "Сподели"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Грешка"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Грешка при споделување"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Грешка при прекин на споделување"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Грешка при промена на привилегии"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Споделено со Вас и групата {group} од {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Споделено со Вас од {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Сподели ја врската"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Заштити со лозинка"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Лозинка"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Дозволи јавен аплоуд"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Прати врска по е-пошта на личност"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Прати"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Постави рок на траење"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Рок на траење"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Сподели по е-пошта:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Не се најдени луѓе"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "група"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Повторно споделување не е дозволено"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Споделено во {item} со {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Не споделувај"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "извести преку електронска пошта"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "може да се измени"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "контрола на пристап"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "креирај"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "ажурирај"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "избриши"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "сподели"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Заштитено со лозинка"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Грешка при тргање на рокот на траење"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Грешка при поставување на рок на траење"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Праќање..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Е-порака пратена"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Предупредување"
@@ -462,27 +462,27 @@ msgstr "%s ресетирање на лозинката"
msgid "Use the following link to reset your password: {link}"
msgstr "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Корисничко име"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,13 +490,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Да, јас сега навистина сакам да ја поништам својата лозинка"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Побарајте ресетирање"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index d63f5d343fb7ac15b321f593be5b49b5732f9935..f35481687f15d6097aaa8b3e194607f7343ec195 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: ml_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 40941f22b4e2419f18bb1762ff9c5ac3d587dc6e..368a83da85e292d221f6da966cc564b91dfddd3e 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr ""
msgid "Share"
msgstr "Kongsi"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Ralat"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Kata laluan"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Amaran"
@@ -456,27 +456,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nama pengguna"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,13 +484,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Permintaan set semula"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 50f94ab69d421b8e0e1d1cd8aeaee0e1ffbd624d..ae2e1d69755f1dd5284e71a0eaaf1dcc17ec3b2f 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "စကားဝှက်"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "ပြင်ဆင်နိုင်"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "ဖန်တီးမည်"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "ဖျက်မည်"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "ဝေမျှမည်"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -456,27 +456,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "သုံးစွဲသူအမည်"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,12 +484,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 7761eee49fbe8c98a12a257f1e34eef8dd111908..8f6765f1c348a1c4f88fc6d0d89a2d455dd1d53f 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s delte »%s« med deg"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -277,140 +277,140 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Feil"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Feil under deling"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Delt med deg av {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Passordbeskyttet"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Passord"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Send"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Set utløpsdato"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Del på epost"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Ingen personer funnet"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "gruppe"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Avslutt deling"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "kan endre"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "opprett"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "oppdater"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "slett"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "del"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Passordbeskyttet"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Kan ikke sette utløpsdato"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sender..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-post sendt"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Advarsel"
@@ -462,27 +462,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Brukernavn"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,13 +490,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Anmod tilbakestilling"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index 5a06431a18f80c9127dbb357eee439220a212914..f001d18324e08b55e6b6e5b4bb275bb15d893fc5 100644
--- a/l10n/nds/core.po
+++ b/l10n/nds/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-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: nds\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index cc1e7f8607f570ea1c6a5d5eb6b63b2205ee8b13..e3ffde47ee8e48f2bd899141f54f9272c2128748 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-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 8b800674f8c3fc2d7818cbe187e6ebc58a5e38b7..0e221a33bfe86f11a2626360f7a2a763ce747210 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -20,12 +20,12 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s deelde »%s« met jou"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Kon geen e-mail sturen aan de volgende gebruikers: %s"
@@ -279,140 +279,140 @@ msgstr "Gedeeld"
msgid "Share"
msgstr "Delen"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Fout"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Fout tijdens het delen"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Fout tijdens het stoppen met delen"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Fout tijdens het veranderen van permissies"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Gedeeld met u en de groep {group} door {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Gedeeld met u door {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Wachtwoord"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Sta publieke uploads toe"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "E-mail link naar persoon"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Versturen"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Stel vervaldatum in"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Vervaldatum"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Deel via e-mail:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Geen mensen gevonden"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "groep"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Verder delen is niet toegestaan"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Gedeeld in {item} met {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Stop met delen"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "kan wijzigen"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "toegangscontrole"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "creëer"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "bijwerken"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "verwijderen"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "deel"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Fout tijdens het verwijderen van de verval datum"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Fout tijdens het instellen van de vervaldatum"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Versturen ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-mail verzonden"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Waarschuwing"
@@ -464,27 +464,27 @@ msgstr "%s wachtwoord reset"
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
+#: lostpassword/templates/lostpassword.php: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 "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Gebruikersnaam"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -492,13 +492,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Ja, ik wil mijn wachtwoord nu echt resetten"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Resetaanvraag"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 804e29162976de75ca4a2270a32fccbe1d61a8d0..e893a6c56620d349fa0f4cb9e742a348d6395761 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -20,12 +20,12 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s delte «%s» med deg"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -279,140 +279,140 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Feil"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Feil ved deling"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Feil ved udeling"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Feil ved endring av tillatingar"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delt med deg og gruppa {group} av {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Delt med deg av {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Passordvern"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Passord"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Tillat offentleg opplasting"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Send lenkja over e-post"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Send"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Set utløpsdato"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Del over e-post:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Fann ingen personar"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "gruppe"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Vidaredeling er ikkje tillate"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {brukar}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Udel"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "kan endra"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "lag"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "oppdater"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "slett"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "del"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Passordverna"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Klarte ikkje fjerna utløpsdato"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Klarte ikkje setja utløpsdato"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Sender …"
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-post sendt"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Åtvaring"
@@ -464,27 +464,27 @@ msgstr "%s passordnullstilling"
msgid "Use the following link to reset your password: {link}"
msgstr "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "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:12
+#: lostpassword/templates/lostpassword.php:15
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:15
+#: lostpassword/templates/lostpassword.php:18
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:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Brukarnamn"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -492,13 +492,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Ja, eg vil nullstilla passordet mitt no"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Be om nullstilling"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 0bd7c175125a87598aa3dcc4ff36dc96862521ef..8197226adebb7ce2e047851a76cfb39dcb00c379 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: nqo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -456,27 +456,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,12 +484,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 821d28da08f3d8973cfc40e00fa24ff985182f7d..3b6b3183e198316da5eaa379fb289904ad5b0066 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr "Parteja"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Error"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Error al partejar"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Error al non partejar"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Error al cambiar permissions"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Parat per senhal"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Senhal"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Met la data d'expiracion"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Data d'expiracion"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Parteja tras corrièl :"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Deguns trobat"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grop"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Tornar partejar es pas permis"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Pas partejador"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "pòt modificar"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "Contraròtle d'acces"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "crea"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "met a jorn"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "escafa"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "parteja"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Parat per senhal"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Error al metre de la data d'expiracion"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Non d'usancièr"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,13 +489,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Tornar botar requesit"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index 23ad71ba198344f4516a42c1ce930796ea3913a1..74f43ec7071e01b2d72a21194a6ec9766b96408d 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -277,140 +277,140 @@ msgstr ""
msgid "Share"
msgstr "ਸਾਂਝਾ ਕਰੋ"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "ਗਲ"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "ਪਾਸਵਰ"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "ਭੇਜੋ"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
@@ -462,27 +462,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,12 +490,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index cf30bc62961740bcd8335e2e9c75fc3d2ab616e1..39628994e27515127c2bc97a0f15b6de06d0aebf 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s Współdzielone »%s« z tobą"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -283,140 +283,140 @@ msgstr "Udostępniono"
msgid "Share"
msgstr "Udostępnij"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Błąd"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Błąd podczas współdzielenia"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Błąd podczas zatrzymywania współdzielenia"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Błąd przy zmianie uprawnień"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Udostępnione tobie i grupie {group} przez {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Udostępnione tobie przez {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Zabezpiecz hasłem"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Hasło"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Pozwól na publiczne wczytywanie"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Wyślij osobie odnośnik poprzez e-mail"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Wyślij"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Ustaw datę wygaśnięcia"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Data wygaśnięcia"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Współdziel poprzez e-mail:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Nie znaleziono ludzi"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupa"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Współdzielenie nie jest możliwe"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Współdzielone w {item} z {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Zatrzymaj współdzielenie"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "może edytować"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "kontrola dostępu"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "utwórz"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "uaktualnij"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "usuń"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "współdziel"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Zabezpieczone hasłem"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Błąd podczas usuwania daty wygaśnięcia"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Błąd podczas ustawiania daty wygaśnięcia"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Wysyłanie..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-mail wysłany"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Ostrzeżenie"
@@ -468,27 +468,27 @@ msgstr "%s reset hasła"
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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nazwa użytkownika"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -496,13 +496,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Tak, naprawdę chcę zresetować hasło teraz"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Żądanie resetowania"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index e2c3bfa1b28c678c9684e802acc96d131a6a6ba0..f1711e357ba567b48f5da4c419d2d2f084af5f2e 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s compartilhou »%s« com você"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Não foi possível enviar e-mail para os seguintes usuários: %s"
@@ -278,140 +278,140 @@ msgstr "Compartilhados"
msgid "Share"
msgstr "Compartilhar"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Erro"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Erro ao compartilhar"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Erro ao descompartilhar"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Erro ao mudar permissões"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartilhado com você e com o grupo {group} por {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Compartilhado com você por {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Compartilhar com usuário ou grupo ..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Compartilher link"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Proteger com senha"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Senha"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Permitir upload público"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Enviar link por e-mail"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Enviar"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Definir data de expiração"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Compartilhar via e-mail:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Nenhuma pessoa encontrada"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupo"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Não é permitido re-compartilhar"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Compartilhado em {item} com {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Descompartilhar"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "notificar por e-mail"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "controle de acesso"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "criar"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "atualizar"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "remover"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "compartilhar"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protegido com senha"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Erro ao remover data de expiração"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Erro ao definir data de expiração"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Enviando ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-mail enviado"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Aviso"
@@ -463,27 +463,27 @@ msgstr "%s redefinir senha"
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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nome de usuário"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -491,13 +491,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer, por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Sim, realmente quero criar uma nova senha."
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Pedir redefinição"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 7dce4b3e0ce769543b5a983ef0074691347da526..8b591f4877f04fcc48f8f08760c6f19fc5aba4b2 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -23,12 +23,12 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s partilhado »%s« contigo"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -282,140 +282,140 @@ msgstr "Partilhado"
msgid "Share"
msgstr "Partilhar"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Erro"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Erro ao partilhar"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Erro ao deixar de partilhar"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Erro ao mudar permissões"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Partilhado consigo e com o grupo {group} por {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Partilhado consigo por {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Proteger com palavra-passe"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Password"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Permitir Envios Públicos"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Enviar o link por e-mail"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Enviar"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Especificar data de expiração"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Partilhar via email:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Não foi encontrado ninguém"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupo"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Não é permitido partilhar de novo"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Partilhado em {item} com {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Deixar de partilhar"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "Controlo de acesso"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "criar"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "actualizar"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "apagar"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "partilhar"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protegido com palavra-passe"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Erro ao retirar a data de expiração"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Erro ao aplicar a data de expiração"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "A Enviar..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-mail enviado"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Aviso"
@@ -467,27 +467,27 @@ msgstr "%s reposição da password"
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
+#: lostpassword/templates/lostpassword.php: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 "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nome de utilizador"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -495,13 +495,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora."
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Pedir reposição"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 0048fd39a872b8a217a6d8d979517305ad1565c6..88bc18690fd8215fed4fcbdcf3f8a8fb6019cc10 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +21,12 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s Partajat »%s« cu tine de"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -285,140 +285,140 @@ msgstr "Partajat"
msgid "Share"
msgstr "Partajează"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Eroare"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Eroare la partajare"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Eroare la anularea partajării"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Eroare la modificarea permisiunilor"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Distribuie cu tine si grupul {group} de {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Distribuie cu tine de {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Protejare cu parolă"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Parolă"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Permiteţi încărcarea publică."
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Expediază legătura prin poșta electronică"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Expediază"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Specifică data expirării"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Data expirării"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Distribuie prin email:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Nici o persoană găsită"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grup"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Repartajarea nu este permisă"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Distribuie in {item} si {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Anulare partajare"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "poate edita"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "control acces"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "creare"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "actualizare"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "ștergere"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "partajare"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Protejare cu parolă"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Eroare la anularea datei de expirare"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Eroare la specificarea datei de expirare"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Se expediază..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Mesajul a fost expediat"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Atenție"
@@ -470,27 +470,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Nume utilizator"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -498,13 +498,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Da, eu chiar doresc să îmi resetez parola acum"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Cerere trimisă"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 9c6eab4419bb35b3f3a2b126a1f7d4515aee1987..4b77965b68dc72589b77a32aadbd10c48cb99219 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -31,12 +31,12 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s поделился »%s« с вами"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Невозможно отправить письмо следующим пользователям: %s"
@@ -295,140 +295,140 @@ msgstr "Общие"
msgid "Share"
msgstr "Открыть доступ"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Ошибка"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Ошибка при открытии доступа"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Ошибка при закрытии доступа"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Ошибка при смене разрешений"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} открыл доступ для Вас и группы {group} "
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} открыл доступ для Вас"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Защитить паролем"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Пароль"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Разрешить открытую загрузку"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Почтовая ссылка на персону"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Отправить"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Установить срок доступа"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Дата окончания"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Поделится через электронную почту:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Ни один человек не найден"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "группа"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Общий доступ не разрешен"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Общий доступ к {item} с {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Закрыть общий доступ"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "может редактировать"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "контроль доступа"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "создать"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "обновить"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "удалить"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "открыть доступ"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Защищено паролем"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Ошибка при отмене срока доступа"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Ошибка при установке срока доступа"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Отправляется ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Письмо отправлено"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Предупреждение"
@@ -480,27 +480,27 @@ msgstr "%s сброс пароля"
msgid "Use the following link to reset your password: {link}"
msgstr "Используйте следующую ссылку чтобы сбросить пароль: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "Ссылка для сброса пароля отправлена вам по электронной почте.<br>Если вы не получите письмо в пределах одной-двух минут, проверьте папку Спам. <br>Если письма там нет, обратитесь к своему администратору."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Запрос не удался. Вы уверены, что email или имя пользователя указаны верно?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "На ваш адрес Email выслана ссылка для сброса пароля."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Имя пользователя"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -508,13 +508,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Да, я действительно хочу сбросить свой пароль"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Запросить сброс"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index 039f8fb9dfab4897657e17f1854433040e920ad9..f37cb719bb2687bcf0a6f608bfcb9e5a81331ca9 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -17,12 +17,12 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -281,140 +281,140 @@ msgstr ""
msgid "Share"
msgstr "Сделать общим"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Ошибка"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Пароль"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Предупреждение"
@@ -466,27 +466,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Имя пользователя"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -494,12 +494,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index bb6f59370b23182cd5cd3dd980432f87d9f11f31..656a7e512458acef2dd28833a649247c6978c391 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr "බෙදා හදා ගන්න"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "දෝෂයක්"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "මුර පදයකින් ආරක්ශාකරන්න"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "මුර පදය"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "කල් ඉකුත් විමේ දිනය"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "විද්යුත් තැපෑල මඟින් බෙදාගන්න: "
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "කණ්ඩායම"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "නොබෙදු"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "සංස්කරණය කළ හැක"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "ප්රවේශ පාලනය"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "සදන්න"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "යාවත්කාලීන කරන්න"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "මකන්න"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "බෙදාහදාගන්න"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "අවවාදය"
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "ඔබගේ මුරපදය ප්රත්යාරම්භ කිරීම සඳහා යොමුව විද්යුත් තැපෑලෙන් ලැබෙනු ඇත"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "පරිශීලක නම"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index faf2067c5f03043dfa2b3768a5e6de4392a206c7..2437cf6338f1e67dbc576172925b232b32ae8218 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-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -281,140 +281,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -466,27 +466,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -494,12 +494,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 7c7a47b692cd2bc5f081297251c8271aeff9c4b9..9082ed8191547ec2df0b3c569a6f46bea066dc51 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s s Vami zdieľa »%s«"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nebolo možné odoslať email týmto používateľom: %s "
@@ -283,140 +283,140 @@ msgstr "Zdieľané"
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Chyba"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Chyba počas zdieľania"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Chyba počas ukončenia zdieľania"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Chyba počas zmeny oprávnení"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Zdieľané s vami a so skupinou {group} používateľom {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Zdieľané s vami používateľom {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Chrániť heslom"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Heslo"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Povoliť verejné nahrávanie"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Odoslať odkaz emailom"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Odoslať"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Nastaviť dátum expirácie"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Dátum expirácie"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Zdieľať cez e-mail:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Používateľ nenájdený"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "skupina"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Zdieľanie už zdieľanej položky nie je povolené"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Zdieľané v {item} s {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "môže upraviť"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "prístupové práva"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "vytvoriť"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "aktualizovať"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "vymazať"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "zdieľať"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Chránené heslom"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Chyba pri odstraňovaní dátumu expirácie"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Chyba pri nastavení dátumu expirácie"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Odosielam ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email odoslaný"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Varovanie"
@@ -468,27 +468,27 @@ msgstr "reset hesla %s"
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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Meno používateľa"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -496,13 +496,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla Vaše dáta. Ak nie ste si isí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Áno, želám si teraz obnoviť svoje heslo"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Požiadať o obnovenie"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 11bee9e72966d81d0132ff4c6885523503242004..f46b04d237af0eb97812edb8d5c8f3627245fd47 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s je delil »%s« z vami"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -288,140 +288,140 @@ msgstr "V souporabi"
msgid "Share"
msgstr "Souporaba"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Napaka"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Napaka med souporabo"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Napaka med odstranjevanjem souporabe"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Napaka med spreminjanjem dovoljenj"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}."
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "V souporabi z vami. Lastnik je {owner}."
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Zaščiti z geslom"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Geslo"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Dovoli javne prenose na strežnik"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Posreduj povezavo po elektronski pošti"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Pošlji"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Nastavi datum preteka"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Datum preteka"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Souporaba preko elektronske pošte:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Ni najdenih uporabnikov"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "skupina"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Nadaljnja souporaba ni dovoljena"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "V souporabi v {item} z {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Prekliči souporabo"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "lahko ureja"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "nadzor dostopa"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "ustvari"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "posodobi"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "izbriši"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "določi souporabo"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Zaščiteno z geslom"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Napaka brisanja datuma preteka"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Napaka med nastavljanjem datuma preteka"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Pošiljanje ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Elektronska pošta je poslana"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Opozorilo"
@@ -473,27 +473,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "Za ponastavitev gesla uporabite povezavo: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Uporabniško ime"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -501,13 +501,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ste prepričani, da želite nadaljevati?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Da, potrjujem ponastavitev gesla"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Zahtevaj ponovno nastavitev"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 01d67c113f488d3b01c790bb55461370bf3d1651..8f18bfadf27c504767f269ae9ec705805d693746 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ndau »%s« me ju"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -278,140 +278,140 @@ msgstr "Ndarë"
msgid "Share"
msgstr "Nda"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Veprim i gabuar"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Veprim i gabuar gjatë ndarjes"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Veprim i gabuar gjatë heqjes së ndarjes"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Veprim i gabuar gjatë ndryshimit të lejeve"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Ndarë me ju dhe me grupin {group} nga {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Ndarë me ju nga {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Mbro me kod"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Kodi"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Lejo Ngarkimin Publik"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Dërgo email me lidhjen"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Dërgo"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Cakto datën e përfundimit"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Data e përfundimit"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Nda me email:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Nuk u gjet asnjë person"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grupi"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Rindarja nuk lejohet"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Ndarë në {item} me {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Hiq ndarjen"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "mund të ndryshosh"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "kontrollimi i hyrjeve"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "krijo"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "azhurno"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "elimino"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "nda"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Mbrojtur me kod"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Duke dërguar..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email-i u dërgua"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -463,27 +463,27 @@ msgstr "Kodi i %s -it u rivendos"
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
+#: lostpassword/templates/lostpassword.php: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 "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
+#: lostpassword/templates/lostpassword.php:15
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:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Përdoruesi"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -491,13 +491,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Po, dua ta rivendos kodin tani"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Bëj kërkesë për rivendosjen"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index f0ab18a6c6d5ecbbf1f2ee7089190ca6cdef2615..8acdcf06ed6d3c7610d175f59b553b1a4d0c8160 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -281,140 +281,140 @@ msgstr ""
msgid "Share"
msgstr "Дели"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Грешка"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Грешка у дељењу"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Грешка код искључења дељења"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Грешка код промене дозвола"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Дељено са вама и са групом {group}. Поделио {owner}."
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Поделио са вама {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Заштићено лозинком"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Лозинка"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Пошаљи"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Постави датум истека"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Датум истека"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Подели поштом:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Особе нису пронађене."
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "група"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Поновно дељење није дозвољено"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Подељено унутар {item} са {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Укини дељење"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "може да мења"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "права приступа"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "направи"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "ажурирај"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "обриши"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "подели"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Заштићено лозинком"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Грешка код поништавања датума истека"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Грешка код постављања датума истека"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Шаљем..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Порука је послата"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Упозорење"
@@ -466,27 +466,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "Овом везом ресетујте своју лозинку: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "Добићете везу за ресетовање лозинке путем е-поште."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Корисничко име"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -494,13 +494,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Захтевај ресетовање"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 53fe6637355ec6daa5973526e4490c0f47b3c25e..3452487724247989920a007e1eb217de4e0ce87c 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -282,140 +282,140 @@ msgstr "Deljeno"
msgid "Share"
msgstr "Podeli"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Greška"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Greška pri deljenju"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Greška u uklanjanju deljenja"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Greška u promeni dozvola"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} podelio sa Vama i grupom {group} "
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Sa vama podelio {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Zaštita lozinkom"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Lozinka"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Pošalji link e-mailom"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Pošalji"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Datum isteka"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Deli putem e-maila"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Nema pronađenih ljudi"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Dalje deljenje nije dozvoljeno"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Deljeno u {item} sa {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Ukljoni deljenje"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "dozvoljene izmene"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "napravi"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "ažuriranje"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "brisanje"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "deljenje"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Zaštćeno lozinkom"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Greška u uklanjanju datuma isteka"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Greška u postavljanju datuma isteka"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Slanje..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email poslat"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -467,27 +467,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "Koristite sledeći link za reset lozinke: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Korisničko ime"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -495,13 +495,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Zahtevaj resetovanje"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 422129943426da831ce621bbe7345af6902b633f..10bc731699d436b02093b568bbc6b1c437c0f6ee 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -7,15 +7,16 @@
# Gunnar Norin <blittan@xbmc.org>, 2013
# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
# medialabs, 2013
+# kallemooo <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
# medialabs, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: Gustav Smedberg <shadow.elf@hotmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,12 +24,12 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s delade »%s« med dig"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Gick inte att skicka e-post till följande användare: %s"
@@ -282,140 +283,140 @@ msgstr "Delad"
msgid "Share"
msgstr "Dela"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Fel"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Fel vid delning"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Fel när delning skulle avslutas"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Fel vid ändring av rättigheter"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delad med dig och gruppen {group} av {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Delad med dig av {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Dela med användare eller grupp..."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Dela länk"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Lösenordsskydda"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Lösenord"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Tillåt publik uppladdning"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "E-posta länk till person"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Skicka"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Sätt utgångsdatum"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Utgångsdatum"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Dela via e-post:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Hittar inga användare"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "Grupp"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Dela vidare är inte tillåtet"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Delad i {item} med {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Sluta dela"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
-msgstr ""
+msgstr "informera via e-post"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "kan redigera"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "åtkomstkontroll"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "skapa"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "uppdatera"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "radera"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "dela"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Lösenordsskyddad"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Fel vid borttagning av utgångsdatum"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Fel vid sättning av utgångsdatum"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Skickar ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-post skickat"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Varning"
@@ -467,27 +468,27 @@ msgstr "%s återställ lösenord"
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
+#: lostpassword/templates/lostpassword.php: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 "Länken för att återställa ditt lösenorden har skickats till din e-postadress<br>Om du inte har erhållit meddelandet inom kort, vänligen kontrollera din skräppost-mapp<br>Om den inte finns där, vänligen kontakta din administratör."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/användarnamn är korrekt?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Användarnamn"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -495,13 +496,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Ja, jag vill verkligen återställa mitt lösenord nu"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Begär återställning"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index a53f53c21aaa11f7cfab32a44b0d80f897803fd9..9bf0a5cd11c88f4467b985bc6a25fe9496251749 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-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-27 06:28+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index de42e6f84961b1a43192419e4c89c9ceed8abf80..823ed29015be75382d942f06fa627f87c56b5a0d 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr "பகிர்வு"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "வழு"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "பகிரும் போதான வழு"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "பகிராமல் உள்ளப்போதான வழு"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "அனுமதிகள் மாறும்போதான வழு"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "கடவுச்சொல்"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "காலாவதி தேதியை குறிப்பிடுக"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "காலவதியாகும் திகதி"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "மின்னஞ்சலினூடான பகிர்வு: "
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "நபர்கள் யாரும் இல்லை"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "குழு"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "மீள்பகிர்வதற்கு அனுமதி இல்லை "
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "பகிரப்படாதது"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "தொகுக்க முடியும்"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "கட்டுப்பாடான அணுகல்"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "உருவவாக்கல்"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "இற்றைப்படுத்தல்"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "நீக்குக"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "பகிர்தல்"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "எச்சரிக்கை"
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். "
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "பயனாளர் பெயர்"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,13 +489,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "கோரிக்கை மீளமைப்பு"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 2edbc125b05df583778c3a2c426f51b20da388f1..795eafbe289a39c432a6a92c6b2ef3f58d9fbc7f 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "పొరపాటు"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "సంకేతపదం"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "పంపించు"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "కాలం చెల్లు తేదీ"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "తొలగించు"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "వాడుకరి పేరు"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,12 +489,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 3fd8b2644e4af568506a68a1cf3e7c07a85a3e73..09fa208d272640c775cb11fc8d94134e21a19879 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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"
@@ -18,12 +18,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -277,140 +277,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr ""
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr ""
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr ""
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr ""
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -462,27 +462,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr ""
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -490,12 +490,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 69b2b981f4b0c136a893772535be9701afb3c35c..b584a5acf6868112ae6b7b1cc227de268d66c45b 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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"
@@ -142,32 +142,32 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:340
+#: js/file-upload.js:345
msgid "Could not get result from server."
msgstr ""
-#: js/file-upload.js:432
+#: js/file-upload.js:437
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:511
+#: js/file-upload.js:516
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:515 js/filelist.js:361
+#: js/file-upload.js:520 js/filelist.js:361
msgid "In the home folder 'Shared' is a reserved filename"
msgstr ""
-#: js/file-upload.js:517 js/filelist.js:363
+#: js/file-upload.js:522 js/filelist.js:363
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:576
+#: js/file-upload.js:581
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:592
+#: js/file-upload.js:597
msgid "Could not create folder"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index dd94663a0f559a8d23e1b89c75984033317701eb..77324fb272059fb2a111f97ef61dcef5ef45882e 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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 d4d5a5b73314b436a6eac46bfe487bab64e3f550..cc199961d96558f7dea798444851abc0b03ca7cd 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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,20 +37,20 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:453
+#: lib/config.php:461
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:457
+#: lib/config.php:465
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:460
+#: lib/config.php:468
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 "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index a8eaf14bdf83ac8734537c51f9fdc53955b3b8a3..a81c8756ce93b82529d4e11f3fdb0c8dac03e410 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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 d1e701a3a4ee44ca4bc835c3cf599357e0d4446a..4b538f8c41f6d3d7a2acf735ef6e7702b8a8abd0 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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 eda99cde6b0061e6a0ab1910babd5ae455168af8..e9a0b8745a3fdde74dc03e08c596b7ee0092a024 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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 cfb7656ca557a903df647ba866815317e8edb5e0..2dc9d64d1fc9f3c46dc2dc276f7838344fc3c9f8 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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/private.pot b/l10n/templates/private.pot
index 07f1fdc0f5c005cfa5af7aa279f1806ce459fc48..3f08c1584ef3612991969e74c7c66ab3e9751809 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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 134e3c4db035e780bd4b27ee49e1372f837396c4..0b89c4030012e8635c9be7d088622613025927c9 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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 cd586666e8392711f17286684218fd3ec6039341..193a9421ebbddd4814240c155025afcb9e0fb910 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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 5ebd0e68922aa480b21f1bd132993ada2d963198..4bf728a48df8a9198d00ea293aea77f65c373107 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\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 67743d7da0f1034a05bd7b365f8dea2ac882db28..9821d28eb711f605334d887e1694d5be5506d833 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr "แชร์แล้ว"
msgid "Share"
msgstr "แชร์"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "ข้อผิดพลาด"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "ถูกแชร์ให้กับคุณโดย {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "รหัสผ่าน"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "ส่งลิงก์ให้ทางอีเมล"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "ส่ง"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "กำหนดวันที่หมดอายุ"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "วันที่หมดอายุ"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "แชร์ผ่านทางอีเมล"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "ไม่พบบุคคลที่ต้องการ"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "กลุ่มผู้ใช้งาน"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "ได้แชร์ {item} ให้กับ {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "ยกเลิกการแชร์"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "สามารถแก้ไข"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "ระดับควบคุมการเข้าใช้งาน"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "สร้าง"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "อัพเดท"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "ลบ"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "แชร์"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "กำลังส่ง..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "ส่งอีเมล์แล้ว"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "คำเตือน"
@@ -456,27 +456,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "ชื่อผู้ใช้งาน"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,13 +484,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "ขอเปลี่ยนรหัสใหม่"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index f27bd2fc8a0ac512b27ace4849a1fce62fe6cb32..4cb6bbb441f84df123405618d8a15560f31c98e4 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -21,12 +21,12 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s sizinle »%s« paylaşımında bulundu"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Şu kullanıcılara posta gönderilemedi: %s"
@@ -280,140 +280,140 @@ msgstr "Paylaşılan"
msgid "Share"
msgstr "Paylaş"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Hata"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Paylaşım sırasında hata "
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Paylaşım iptal ediliyorken hata"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "İzinleri değiştirirken hata oluştu"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr " {owner} tarafından sizinle ve {group} ile paylaştırılmış"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} trafından sizinle paylaştırıldı"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr "Kullanıcı veya grup ile paylaş.."
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr "Paylaşma bağlantısı"
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Parola koruması"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Parola"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "Herkes tarafından yüklemeye izin ver"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Bağlantıyı e-posta ile gönder"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Gönder"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Son kullanma tarihini ayarla"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Son kullanım tarihi"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "E-posta ile paylaş"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Kişi bulunamadı"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "grup"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Tekrar paylaşmaya izin verilmiyor"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr " {item} içinde {user} ile paylaşılanlarlar"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Paylaşılmayan"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr "e-posta ile bildir"
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "düzenleyebilir"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "erişim kontrolü"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "oluştur"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "güncelle"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "sil"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "paylaş"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Parola korumalı"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Geçerlilik tarihi tanımlama kaldırma hatası"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Geçerlilik tarihi tanımlama hatası"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Gönderiliyor..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "E-posta gönderildi"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Uyarı"
@@ -465,27 +465,27 @@ msgstr "%s 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
+#: lostpassword/templates/lostpassword.php: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 "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Isteği başarısız oldu!<br>E-posta / kullanıcı adınızı doğru olduğundan emin misiniz?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "Parolanızı sıfırlamak için bir bağlantıyı e-posta olarak alacaksınız."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Kullanıcı Adı"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -493,13 +493,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını aktif etmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile irtibata geçiniz. Gerçekten devam etmek istiyor musunuz?"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "Evet,Şu anda parolamı sıfırlamak istiyorum."
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Sıfırlama iste"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index d0be1e1dcdb65584fb745ed497acd27b24a89ef9..41617b9d6aebf4c29768af335a644d853f76806b 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr ""
msgid "Share"
msgstr "ھەمبەھىر"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "خاتالىق"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr ""
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr ""
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "ئىم"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "يوللا"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr ""
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr ""
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr ""
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "گۇرۇپپا"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "ھەمبەھىرلىمە"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr ""
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr ""
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "ئۆچۈر"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "ھەمبەھىر"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr ""
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "ئاگاھلاندۇرۇش"
@@ -456,27 +456,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr ""
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr ""
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "ئىشلەتكۈچى ئاتى"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,12 +484,12 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
msgstr ""
#: lostpassword/templates/resetpassword.php:4
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 7b67bf046449e3601e58b84a005ed4d320e6b189..be69646c565c24e258331770260a31ab90e02b85 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -281,140 +281,140 @@ msgstr "Опубліковано"
msgid "Share"
msgstr "Поділитися"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Помилка"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Помилка під час публікації"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Помилка під час відміни публікації"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Помилка при зміні повноважень"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr " {owner} опублікував для Вас та для групи {group}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} опублікував для Вас"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Захистити паролем"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Пароль"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Ел. пошта належить Пану"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Надіслати"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Встановити термін дії"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Термін дії"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Опублікувати через Ел. пошту:"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Жодної людини не знайдено"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "група"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Пере-публікація не дозволяється"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Опубліковано {item} для {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Закрити доступ"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "може редагувати"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "контроль доступу"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "створити"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "оновити"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "видалити"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "опублікувати"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Захищено паролем"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Помилка при відміні терміна дії"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Помилка при встановленні терміна дії"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Надсилання..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Ел. пошта надіслана"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Попередження"
@@ -466,27 +466,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "Використовуйте наступне посилання для скидання пароля: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту."
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Ім'я користувача"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -494,13 +494,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Запит скидання"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 5146c4091b92bd5bd9eb4705b07d1b25a8a9dfbb..4cc16d351c5e769bf79b8e7b55e7eb7740dc10f5 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -276,140 +276,140 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "ایرر"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "شئیرنگ کے دوران ایرر"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "شئیرنگ ختم کرنے کے دوران ایرر"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "اختیارات کو تبدیل کرنے کے دوران ایرر"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "پاسورڈ سے محفوظ کریں"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "پاسورڈ"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr ""
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "تاریخ معیاد سیٹ کریں"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "تاریخ معیاد"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr ""
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "کوئی لوگ نہیں ملے۔"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "دوبارہ شئیر کرنے کی اجازت نہیں"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "شئیرنگ ختم کریں"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "ایڈٹ کر سکے"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "اسیس کنٹرول"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "نیا بنائیں"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "اپ ڈیٹ"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "ختم کریں"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "شئیر کریں"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr ""
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr ""
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -461,27 +461,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔ {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "یوزر نیم"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -489,13 +489,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "ری سیٹ کی درخواست کریں"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index b9e928ef70dde91a28f63b091e706e3102daf4f7..b5ed1836cf7a666c6cbc15c587895b204c33eb58 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -18,12 +18,12 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -272,140 +272,140 @@ msgstr "Được chia sẻ"
msgid "Share"
msgstr "Chia sẻ"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "Lỗi"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "Lỗi trong quá trình chia sẻ"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "Lỗi trong quá trình gỡ chia sẻ"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "Lỗi trong quá trình phân quyền"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "Đã được chia sẽ bởi {owner}"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "Mật khẩu bảo vệ"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Mật khẩu"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "Liên kết email tới cá nhân"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "Gởi"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "Đặt ngày kết thúc"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "Ngày kết thúc"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "Chia sẻ thông qua email"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "Không tìm thấy người nào"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "nhóm"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "Chia sẻ lại không được cho phép"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "Đã được chia sẽ trong {item} với {user}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "Bỏ chia sẻ"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "có thể chỉnh sửa"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "quản lý truy cập"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "tạo"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "cập nhật"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "xóa"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "chia sẻ"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "Mật khẩu bảo vệ"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "Lỗi không thiết lập ngày kết thúc"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "Lỗi cấu hình ngày kết thúc"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "Đang gởi ..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email đã được gửi"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "Cảnh báo"
@@ -457,27 +457,27 @@ msgstr ""
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
+#: lostpassword/templates/lostpassword.php: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 "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn.<br>Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác.<br>Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống."
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
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:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "Tên đăng nhập"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -485,13 +485,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "Yêu cầu thiết lập lại "
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 337be5410ecc1f8ebb10a0433245371b85a735fc..d13d80d9d32ff4263e542d31ad4470dcf3ef7a81 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +21,12 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s 向您分享了 »%s«"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -275,140 +275,140 @@ msgstr "已共享"
msgid "Share"
msgstr "分享"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "错误"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "共享时出错"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "取消共享时出错"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "修改权限时出错"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} 共享给您及 {group} 组"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} 与您共享"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "密码保护"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "密码"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "允许公开上传"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "发送链接到个人"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "发送"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "设置过期日期"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "过期日期"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "通过Email共享"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "未找到此人"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "组"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "不允许二次共享"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "在 {item} 与 {user} 共享。"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "取消共享"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "可以修改"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "访问控制"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "创建"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "更新"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "删除"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "共享"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "密码已受保护"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "取消设置过期日期时出错"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "设置过期日期时出错"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "正在发送..."
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "邮件已发送"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "警告"
@@ -460,27 +460,27 @@ msgstr "重置 %s 的密码"
msgid "Use the following link to reset your password: {link}"
msgstr "使用以下链接重置您的密码：{link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "重置密码的链接已发送到您的邮箱。<br>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<br>如果没有在那里，请询问您的本地管理员。"
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "请求失败<br>您确定您的邮箱/用户名是正确的？"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "您将会收到包含可以重置密码链接的邮件。"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "用户名"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -488,13 +488,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "使得，我真的要现在重设密码"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "请求重置"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index d4c31763454210d6ff5b8c8919238d3f774adfee..81024abca03d8e99ac1303a43647b1a01e7ffd8b 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-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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,12 +17,12 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -271,140 +271,140 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "錯誤"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "分享時發生錯誤"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "取消分享時發生錯誤"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "更改權限時發生錯誤"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner}與你及群組的分享"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner}與你的分享"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "密碼保護"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "密碼"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr ""
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "傳送"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "設定分享期限"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "分享期限"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "以電郵分享"
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "找不到"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr ""
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "取消分享"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr ""
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr ""
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "新增"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "更新"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "刪除"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "分享"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "密碼保護"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "傳送中"
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "郵件已傳"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr ""
@@ -456,27 +456,27 @@ msgstr ""
msgid "Use the following link to reset your password: {link}"
msgstr "請用以下連結重設你的密碼: {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 ""
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "你將收到一封電郵"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "用戶名稱"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -484,13 +484,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr ""
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr ""
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "重設"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 7316cdc213f2d9d51662151a867688cf8c3dd89b..a1a804f4732ee662ce27dfa75eaa89c8b83047bd 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-29 07:28-0400\n"
-"PO-Revision-Date: 2013-10-28 10:44+0000\n"
+"POT-Creation-Date: 2013-10-30 03:32-0400\n"
+"PO-Revision-Date: 2013-10-30 07:32+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"
@@ -19,12 +19,12 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:118 ajax/share.php:197
+#: ajax/share.php:119 ajax/share.php:198
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s 與您分享了 %s"
-#: ajax/share.php:168
+#: ajax/share.php:169
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "無法寄送郵件給這些使用者：%s"
@@ -273,140 +273,140 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
-#: js/share.js:688
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
+#: js/share.js:702
msgid "Error"
msgstr "錯誤"
-#: js/share.js:151 js/share.js:716
+#: js/share.js:160 js/share.js:730
msgid "Error while sharing"
msgstr "分享時發生錯誤"
-#: js/share.js:162
+#: js/share.js:171
msgid "Error while unsharing"
msgstr "取消分享時發生錯誤"
-#: js/share.js:169
+#: js/share.js:178
msgid "Error while changing permissions"
msgstr "修改權限時發生錯誤"
-#: js/share.js:178
+#: js/share.js:187
msgid "Shared with you and the group {group} by {owner}"
msgstr "由 {owner} 分享給您和 {group}"
-#: js/share.js:180
+#: js/share.js:189
msgid "Shared with you by {owner}"
msgstr "{owner} 已經和您分享"
-#: js/share.js:203
+#: js/share.js:212
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:209
+#: js/share.js:218
msgid "Share link"
msgstr ""
-#: js/share.js:212
+#: js/share.js:221
msgid "Password protect"
msgstr "密碼保護"
-#: js/share.js:214 templates/installation.php:57 templates/login.php:32
+#: js/share.js:223 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "密碼"
-#: js/share.js:219
+#: js/share.js:228
msgid "Allow Public Upload"
msgstr "允許任何人上傳"
-#: js/share.js:223
+#: js/share.js:232
msgid "Email link to person"
msgstr "將連結 email 給別人"
-#: js/share.js:224
+#: js/share.js:233
msgid "Send"
msgstr "寄出"
-#: js/share.js:229
+#: js/share.js:238
msgid "Set expiration date"
msgstr "指定到期日"
-#: js/share.js:230
+#: js/share.js:239
msgid "Expiration date"
msgstr "到期日"
-#: js/share.js:263
+#: js/share.js:272
msgid "Share via email:"
msgstr "透過電子郵件分享："
-#: js/share.js:266
+#: js/share.js:275
msgid "No people found"
msgstr "沒有找到任何人"
-#: js/share.js:295 js/share.js:332
+#: js/share.js:305 js/share.js:342
msgid "group"
msgstr "群組"
-#: js/share.js:306
+#: js/share.js:316
msgid "Resharing is not allowed"
msgstr "不允許重新分享"
-#: js/share.js:348
+#: js/share.js:358
msgid "Shared in {item} with {user}"
msgstr "已和 {user} 分享 {item}"
-#: js/share.js:370
+#: js/share.js:380
msgid "Unshare"
msgstr "取消分享"
-#: js/share.js:378
+#: js/share.js:388
msgid "notify by email"
msgstr ""
-#: js/share.js:381
+#: js/share.js:391
msgid "can edit"
msgstr "可編輯"
-#: js/share.js:383
+#: js/share.js:393
msgid "access control"
msgstr "存取控制"
-#: js/share.js:386
+#: js/share.js:396
msgid "create"
msgstr "建立"
-#: js/share.js:389
+#: js/share.js:399
msgid "update"
msgstr "更新"
-#: js/share.js:392
+#: js/share.js:402
msgid "delete"
msgstr "刪除"
-#: js/share.js:395
+#: js/share.js:405
msgid "share"
msgstr "分享"
-#: js/share.js:437 js/share.js:663
+#: js/share.js:447 js/share.js:677
msgid "Password protected"
msgstr "受密碼保護"
-#: js/share.js:676
+#: js/share.js:690
msgid "Error unsetting expiration date"
msgstr "取消到期日設定失敗"
-#: js/share.js:688
+#: js/share.js:702
msgid "Error setting expiration date"
msgstr "設定到期日發生錯誤"
-#: js/share.js:703
+#: js/share.js:717
msgid "Sending ..."
msgstr "正在傳送…"
-#: js/share.js:714
+#: js/share.js:728
msgid "Email sent"
msgstr "Email 已寄出"
-#: js/share.js:738
+#: js/share.js:752
msgid "Warning"
msgstr "警告"
@@ -458,27 +458,27 @@ msgstr "%s 密碼重設"
msgid "Use the following link to reset your password: {link}"
msgstr "請至以下連結重設您的密碼： {link}"
-#: lostpassword/templates/lostpassword.php:4
+#: lostpassword/templates/lostpassword.php: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 "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被歸為垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。"
-#: lostpassword/templates/lostpassword.php:12
+#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
msgstr "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？"
-#: lostpassword/templates/lostpassword.php:15
+#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
msgstr "重設密碼的連結將會寄到您的電子郵件信箱。"
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:51
#: templates/login.php:25
msgid "Username"
msgstr "使用者名稱"
-#: lostpassword/templates/lostpassword.php:22
+#: lostpassword/templates/lostpassword.php:25
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -486,13 +486,13 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？"
-#: lostpassword/templates/lostpassword.php:24
+#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
msgstr "對，我現在想要重設我的密碼。"
-#: lostpassword/templates/lostpassword.php:27
-msgid "Request reset"
-msgstr "請求重設"
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index fc2d965d7f97fff2d273ae2de1f90dcbb701b7f5..c1e5b34c8aad48054cba7cdd9ec469160287646e 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -64,6 +64,10 @@ class Cache {
* @return int
*/
public function getMimetypeId($mime) {
+ if (empty($mime)) {
+ // Can not insert empty string into Oracle NOT NULL column.
+ $mime = 'application/octet-stream';
+ }
if (empty(self::$mimetypeIds)) {
$this->loadMimetypes();
}
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index b491b60b0d0d67fba63b994a27b9aafefcc496e3..da223567001bf80e2ef153c9466943c091070845 100644
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -99,6 +99,24 @@ class Updater {
}
}
+ /**
+ * @brief get file owner and path
+ * @param string $filename
+ * @return array with the oweners uid and the owners path
+ */
+ private 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, '/files/' . $filename);
+ }
+
/**
* Update the mtime and ETag of all parent folders
*
@@ -107,23 +125,32 @@ class Updater {
*/
static public function correctFolder($path, $time) {
if ($path !== '' && $path !== '/') {
- $parent = dirname($path);
- if ($parent === '.' || $parent === '\\') {
- $parent = '';
- }
+
+ list($owner, $realPath) = self::getUidAndFilename(dirname($path));
+
/**
* @var \OC\Files\Storage\Storage $storage
* @var string $internalPath
*/
- list($storage, $internalPath) = self::resolvePath($parent);
- if ($storage) {
- $cache = $storage->getCache();
- $id = $cache->getId($internalPath);
- if ($id !== -1) {
- $cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath)));
- self::correctFolder($parent, $time);
+ $view = new \OC\Files\View('/' . $owner);
+
+ list($storage, $internalPath) = $view->resolvePath($realPath);
+ $cache = $storage->getCache();
+ $id = $cache->getId($internalPath);
+
+ while ($id !== -1) {
+ $cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath)));
+ if ($realPath !== '') {
+ $realPath = dirname($realPath);
+ if($realPath === '/') {
+ $realPath = "";
+ }
+ // check storage for parent in case we change the storage in this step
+ list($storage, $internalPath) = $view->resolvePath($realPath);
+ $cache = $storage->getCache();
+ $id = $cache->getId($internalPath);
} else {
- Util::writeLog('core', 'Path not in cache: ' . $internalPath, Util::ERROR);
+ $id = -1;
}
}
}
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index 242a81cb5a4f1097123c9a9c0d7a6732a4231cbd..d7cc9ebbf4e9a5cb905bf9b8f5e25a989d9c0986 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -61,8 +61,6 @@ class Detection {
* @return string
*/
public function detect($path) {
- $isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
-
if (@is_dir($path)) {
// directories are easy
return "httpd/unix-directory";
@@ -76,9 +74,11 @@ class Detection {
$info = @strtolower(finfo_file($finfo, $path));
if ($info) {
$mimeType = substr($info, 0, strpos($info, ';'));
+ return empty($mimeType) ? 'application/octet-stream' : $mimeType;
}
finfo_close($finfo);
}
+ $isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) {
// use mime magic extension if available
$mimeType = mime_content_type($path);
@@ -94,6 +94,10 @@ class Detection {
//trim the newline
$mimeType = trim($reply);
+ if (empty($mimeType)) {
+ $mimeType = 'application/octet-stream';
+ }
+
}
return $mimeType;
}
diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php
index 1ec10fe56889d1ff5e306f1046d9a29c18c46b3e..7795011fd062ee9c78471b2475d8a97225e97535 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -88,27 +88,27 @@ class URLGenerator implements IURLGenerator {
if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) {
return \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image";
} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.svg")
- && file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.png")) {
+ && file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.png")) {
return \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$basename.png";
} elseif (file_exists(\OC_App::getAppPath($app) . "/img/$image")) {
return \OC_App::getAppWebPath($app) . "/img/$image";
} elseif (!file_exists(\OC_App::getAppPath($app) . "/img/$basename.svg")
- && file_exists(\OC_App::getAppPath($app) . "/img/$basename.png")) {
+ && file_exists(\OC_App::getAppPath($app) . "/img/$basename.png")) {
return \OC_App::getAppPath($app) . "/img/$basename.png";
} elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$image")) {
return \OC::$WEBROOT . "/themes/$theme/$app/img/$image";
} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.svg")
- && file_exists(\OC::$WEBROOT . "/themes/$theme/$app/img/$basename.png"))) {
+ && file_exists(\OC::$SERVERROOT . "/themes/$theme/$app/img/$basename.png"))) {
return \OC::$WEBROOT . "/themes/$theme/$app/img/$basename.png";
} elseif (!empty($app) and file_exists(\OC::$SERVERROOT . "/$app/img/$image")) {
return \OC::$WEBROOT . "/$app/img/$image";
} elseif (!empty($app) and (!file_exists(\OC::$SERVERROOT . "/$app/img/$basename.svg")
- && file_exists(\OC::$WEBROOT . "/$app/img/$basename.png"))) {
+ && file_exists(\OC::$SERVERROOT . "/$app/img/$basename.png"))) {
return \OC::$WEBROOT . "/$app/img/$basename.png";
} elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$image")) {
return \OC::$WEBROOT . "/themes/$theme/core/img/$image";
} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
- && file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
+ && file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
return \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
} elseif (file_exists(\OC::$SERVERROOT . "/core/img/$image")) {
return \OC::$WEBROOT . "/core/img/$image";
diff --git a/lib/private/user.php b/lib/private/user.php
index 6b350d4cf1b3cad331b6062e08fee83e585a1a35..f15fdf1dbbcc21c2548d2def91c3dc7ba81eb062 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -187,18 +187,25 @@ class OC_User {
public static function deleteUser($uid) {
$user = self::getManager()->get($uid);
if ($user) {
- $user->delete();
+ $result = $user->delete();
- // We have to delete the user from all groups
- foreach (OC_Group::getUserGroups($uid) as $i) {
- OC_Group::removeFromGroup($uid, $i);
+ // if delete was successful we clean-up the rest
+ if ($result) {
+
+ // We have to delete the user from all groups
+ foreach (OC_Group::getUserGroups($uid) as $i) {
+ OC_Group::removeFromGroup($uid, $i);
+ }
+ // Delete the user's keys in preferences
+ OC_Preferences::deleteUser($uid);
+
+ // Delete user files in /data/
+ OC_Helper::rmdirr(\OC_User::getHome($uid));
+
+ // Remove it from the Cache
+ self::getManager()->delete($uid);
}
- // Delete the user's keys in preferences
- OC_Preferences::deleteUser($uid);
- // Delete user files in /data/
- OC_Helper::rmdirr(OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid . '/');
-
return true;
} else {
return false;
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 13286bc28a48ad964ca7278de0373c554e8654c9..703c8cd7413ddfd273934dd3775fcc3a2700ab2e 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -118,6 +118,20 @@ class Manager extends PublicEmitter {
return ($user !== null);
}
+ /**
+ * remove deleted user from cache
+ *
+ * @param string $uid
+ * @return bool
+ */
+ public function delete($uid) {
+ if (isset($this->cachedUsers[$uid])) {
+ unset($this->cachedUsers[$uid]);
+ return true;
+ }
+ return false;
+ }
+
/**
* Check if the password is valid for the user
*
diff --git a/lib/public/share.php b/lib/public/share.php
index dce3c2211b14963b6129ecab9e5e73ee0af051db..c62f964fe1b9bc034f3d79f1e285b567df278fe2 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -428,33 +428,45 @@ class Share {
}
/**
- * Share an item with a user, group, or via private link
- * @param string Item type
- * @param string Item source
- * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @param string User or group the item is being shared with
- * @param int CRUDS permissions
- * @return bool|string Returns true on success or false on failure, Returns token on success for links
- */
- public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions) {
+ * Share an item with a user, group, or via private link
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+ * @param string $shareWith User or group the item is being shared with
+ * @param int $permissions CRUDS
+ * @param null $itemSourceName
+ * @throws \Exception
+ * @internal param \OCP\Item $string type
+ * @internal param \OCP\Item $string source
+ * @internal param \OCP\SHARE_TYPE_USER $int , SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+ * @internal param \OCP\User $string or group the item is being shared with
+ * @internal param \OCP\CRUDS $int permissions
+ * @return bool|string Returns true on success or false on failure, Returns token on success for links
+ */
+ public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null) {
$uidOwner = \OC_User::getUser();
$sharingPolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
+
+ if (is_null($itemSourceName)) {
+ $itemSourceName = $itemSource;
+ }
+
// Verify share type and sharing conditions are met
if ($shareType === self::SHARE_TYPE_USER) {
if ($shareWith == $uidOwner) {
- $message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is the item owner';
+ $message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' is the item owner';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
}
if (!\OC_User::userExists($shareWith)) {
- $message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' does not exist';
+ $message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' does not exist';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
}
if ($sharingPolicy == 'groups_only') {
$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
if (empty($inGroup)) {
- $message = 'Sharing '.$itemSource.' failed, because the user '
+ $message = 'Sharing '.$itemSourceName.' failed, because the user '
.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
@@ -467,19 +479,19 @@ class Share {
// owner and is not a user share, this use case is for increasing
// permissions for a specific user
if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
- $message = 'Sharing '.$itemSource.' failed, because this item is already shared with '.$shareWith;
+ $message = 'Sharing '.$itemSourceName.' failed, because this item is already shared with '.$shareWith;
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
}
}
} else if ($shareType === self::SHARE_TYPE_GROUP) {
if (!\OC_Group::groupExists($shareWith)) {
- $message = 'Sharing '.$itemSource.' failed, because the group '.$shareWith.' does not exist';
+ $message = 'Sharing '.$itemSourceName.' failed, because the group '.$shareWith.' does not exist';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
}
if ($sharingPolicy == 'groups_only' && !\OC_Group::inGroup($uidOwner, $shareWith)) {
- $message = 'Sharing '.$itemSource.' failed, because '
+ $message = 'Sharing '.$itemSourceName.' failed, because '
.$uidOwner.' is not a member of the group '.$shareWith;
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
@@ -492,7 +504,7 @@ class Share {
// owner and is not a group share, this use case is for increasing
// permissions for a specific user
if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
- $message = 'Sharing '.$itemSource.' failed, because this item is already shared with '.$shareWith;
+ $message = 'Sharing '.$itemSourceName.' failed, because this item is already shared with '.$shareWith;
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
}
@@ -534,14 +546,14 @@ class Share {
$token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH);
}
$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions,
- null, $token);
+ null, $token, $itemSourceName);
if ($result) {
return $token;
} else {
return false;
}
}
- $message = 'Sharing '.$itemSource.' failed, because sharing with links is not allowed';
+ $message = 'Sharing '.$itemSourceName.' failed, because sharing with links is not allowed';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
return false;
@@ -600,7 +612,7 @@ class Share {
// return false;
// } else {
// Put the item into the database
- return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
+ return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, null, $itemSourceName);
// }
}
@@ -1320,20 +1332,22 @@ class Share {
* @return bool Returns true on success or false on failure
*/
private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
- $permissions, $parentFolder = null, $token = null) {
+ $permissions, $parentFolder = null, $token = null, $itemSourceName = null) {
$backend = self::getBackend($itemType);
+
// Check if this is a reshare
if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
+
// Check if attempting to share back to owner
if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) {
- $message = 'Sharing '.$itemSource.' failed, because the user '.$shareWith.' is the original sharer';
+ $message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' is the original sharer';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
}
// Check if share permissions is granted
if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & PERMISSION_SHARE) {
if (~(int)$checkReshare['permissions'] & $permissions) {
- $message = 'Sharing '.$itemSource
+ $message = 'Sharing '.$itemSourceName
.' failed, because the permissions exceed permissions granted to '.$uidOwner;
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
@@ -1347,7 +1361,7 @@ class Share {
$filePath = $checkReshare['file_target'];
}
} else {
- $message = 'Sharing '.$itemSource.' failed, because resharing is not allowed';
+ $message = 'Sharing '.$itemSourceName.' failed, because resharing is not allowed';
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
}
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index d8414dadbec7f37b0b7aba643d064f899460ebae..e3d3aae818d4e810fab9410bb1c9a2c61e1abc07 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -22,6 +22,8 @@ class Updater extends \PHPUnit_Framework_TestCase {
*/
private $scanner;
+ private $stateFilesEncryption;
+
/**
* @var \OC\Files\Cache\Cache $cache
*/
@@ -30,6 +32,12 @@ class Updater extends \PHPUnit_Framework_TestCase {
private static $user;
public function setUp() {
+
+ // remember files_encryption state
+ $this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
+ // we want to tests with the encryption app disabled
+ \OC_App::disable('files_encryption');
+
$this->storage = new \OC\Files\Storage\Temporary(array());
$textData = "dummy file data\n";
$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
@@ -47,6 +55,10 @@ class Updater extends \PHPUnit_Framework_TestCase {
if (!self::$user) {
self::$user = uniqid();
}
+
+ \OC_User::createUser(self::$user, 'password');
+ \OC_User::setUserId(self::$user);
+
\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
Filesystem::clearMounts();
@@ -64,7 +76,13 @@ class Updater extends \PHPUnit_Framework_TestCase {
if ($this->cache) {
$this->cache->clear();
}
+ $result = \OC_User::deleteUser(self::$user);
+ $this->assertTrue($result);
Filesystem::tearDown();
+ // reset app files_encryption
+ if ($this->stateFilesEncryption) {
+ \OC_App::enable('files_encryption');
+ }
}
public function testWrite() {
diff --git a/version.php b/version.php
index 5400ca97bef118103e7f765ab1629ed9dae34070..1a4672354f6cf351240a676c1fc2120781e2b549 100644
--- a/version.php
+++ b/version.php
@@ -1,10 +1,10 @@
<?php
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number.
-$OC_Version=array(6, 00, 0, 2);
+$OC_Version=array(6, 00, 0, 3);
-// The human radable string
-$OC_VersionString='6.0 beta 1';
+// The human readable string
+$OC_VersionString='6.0 beta 2';
// The ownCloud edition
$OC_Edition='';