diff options
278 files changed, 7777 insertions, 2653 deletions
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php deleted file mode 100644 index f920f842166..00000000000 --- a/apps/files/appinfo/update.php +++ /dev/null @@ -1,46 +0,0 @@ -<?php - -// fix webdav properties,add namespace in front of the property, update for OC4.5 -$installedVersion=OCP\Config::getAppValue('files', 'installed_version'); -if (version_compare($installedVersion, '1.1.6', '<')) { - $concat = OC_DB::getConnection()->getDatabasePlatform()-> - getConcatExpression( '\'{DAV:}\'', '`propertyname`' ); - $query = OC_DB::prepare(' - UPDATE `*PREFIX*properties` - SET `propertyname` = ' . $concat . ' - WHERE `propertyname` NOT LIKE \'{%\' - '); - $query->execute(); -} - -//update from OC 3 - -//try to remove remaining files. -//Give a warning if not possible - -$filesToRemove = array( - 'ajax', - 'appinfo', - 'css', - 'js', - 'l10n', - 'templates', - 'admin.php', - 'download.php', - 'index.php', - 'settings.php' -); - -foreach($filesToRemove as $file) { - $filepath = OC::$SERVERROOT . '/files/' . $file; - if(!file_exists($filepath)) { - continue; - } - $success = OCP\Files::rmdirr($filepath); - if($success === false) { - //probably not sufficient privileges, give up and give a message. - OCP\Util::writeLog('files', 'Could not clean /files/ directory.' - .' Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR); - break; - } -} diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 2aae73f8bd0..3dc5ef5a396 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -83,7 +83,7 @@ min-width: 688px; /* 768 (mobile break) - 80 (nav width) */ } -#filestable tbody tr { background-color:#fff; height:40px; } +#filestable tbody tr { background-color:#fff; height:51px; } #filestable tbody tr:hover, tbody tr:active { background-color: rgb(240,240,240); } diff --git a/apps/files_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php index 7e08e073095..8b51ec775db 100644 --- a/apps/files_encryption/l10n/ast.php +++ b/apps/files_encryption/l10n/ast.php @@ -1,13 +1,44 @@ <?php $TRANSLATIONS = array( -"Password successfully changed." => "Contraseña camudada esitosamente.", -"Could not change the password. Maybe the old password was not correct." => "Nun pue camudase la contraseña. Quiciabes la contraseña vieya nun fore correuta.", -"personal settings" => "axustes personales", +"Recovery key successfully enabled" => "Habilitóse la recuperación de ficheros", +"Could not enable recovery key. Please check your recovery key password!" => "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.", +"Recovery key successfully disabled" => "Clave de recuperación deshabilitada", +"Could not disable recovery key. Please check your recovery key password!" => "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!", +"Password successfully changed." => "Camudóse la contraseña", +"Could not change the password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.", +"Private key password successfully updated." => "Contraseña de clave privada anovada correchamente.", +"Could not update the private key password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.", +"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." => "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.", +"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." => "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros.", +"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartÃu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.", +"Unknown error please check your system settings or contact your administrator" => "Fallu desconocÃu. Verifica la configuración del sistema o ponte en contautu col alministrador", +"Missing requirements." => "Requisitos incompletos.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse.", +"Following users are not set up for encryption:" => "Los siguientes usuarios nun se configuraron pal cifráu:", +"Initial encryption started... This can take some time. Please wait." => "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera.", +"Initial encryption running... Please try again later." => "Cifráu inicial en cursu... Inténtalo dempués.", +"Go directly to your " => "Dir direutamente a", +"personal settings" => "opciones personales", "Encryption" => "Cifráu", -"Enabled" => "Habilitáu", +"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);", +"Recovery key password" => "Contraseña de clave de recuperación", +"Repeat Recovery key password" => "Repeti la contraseña de clave de recuperación", +"Enabled" => "Habilitar", "Disabled" => "Deshabilitáu", -"Change Password" => "Camudar conseña", -" If you don't remember your old password you can ask your administrator to recover your files." => "Si nun recuerdes la to contraseña vieya pues entrugar al to alministrador pa recuperar los tos ficheros.", -"Could not update file recovery" => "Nun pue anovase'l ficheru de recuperación" +"Change recovery key password:" => "Camudar la contraseña de la clave de recuperación", +"Old Recovery key password" => "Clave de recuperación vieya", +"New Recovery key password" => "Clave de recuperación nueva", +"Repeat New Recovery key password" => "Repetir la clave de recuperación nueva", +"Change Password" => "Camudar contraseña", +"Your private key password no longer match your log-in password:" => "La to contraseña de clave privada yá nun concasa cola contraseña d'accesu:", +"Set your old private key password to your current log-in password." => "Afitar la contraseña de la to clave privada vieya a la to contraseña actual d'accesu.", +" If you don't remember your old password you can ask your administrator to recover your files." => "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.", +"Old log-in password" => "Contraseña d'accesu vieya", +"Current log-in password" => "Contraseña d'accesu actual", +"Update Private Key Password" => "Anovar Contraseña de Clave Privada", +"Enable password recovery:" => "Habilitar la recuperación de contraseña:", +"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña", +"File recovery settings updated" => "Opciones de recuperación de ficheros anovada", +"Could not update file recovery" => "Nun pudo anovase la recuperación de ficheros" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index a4f7bd35497..7d86eb72ed1 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -254,7 +254,7 @@ class Crypt { * @brief Concatenate encrypted data with its IV and padding
* @param string $content content to be concatenated
* @param string $iv IV to be concatenated
- * @returns string concatenated content
+ * @return string concatenated content
*/
private static function concatIv($content, $iv) {
@@ -267,7 +267,7 @@ class Crypt { /**
* @brief Split concatenated data and IV into respective parts
* @param string $catFile concatenated data to be split
- * @returns array keys: encrypted, iv
+ * @return array keys: encrypted, iv
*/
private static function splitIv($catFile) {
@@ -330,7 +330,7 @@ class Crypt { * @internal param string $source
* @internal param string $target
* @internal param string $key the decryption key
- * @returns string decrypted content
+ * @return string decrypted content
*
* This function decrypts a file
*/
@@ -362,7 +362,7 @@ class Crypt { * @brief Decrypt private key and check if the result is a valid keyfile
* @param string $encryptedKey encrypted keyfile
* @param string $passphrase to decrypt keyfile
- * @returns encrypted private key or false
+ * @return encrypted private key or false
*
* This function decrypts a file
*/
@@ -389,7 +389,7 @@ class Crypt { * @brief Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
* @param array $publicKeys array keys must be the userId of corresponding user
- * @returns array keys: keys (array, key = userId), data
+ * @return array keys: keys (array, key = userId), data
* @note symmetricDecryptFileContent() can decrypt files created using this method
*/
public static function multiKeyEncrypt($plainContent, array $publicKeys) {
@@ -440,7 +440,7 @@ class Crypt { * @param $privateKey
* @return false|string
* @internal param string $plainContent content to be encrypted
- * @returns string $plainContent decrypted string
+ * @return string $plainContent decrypted string
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
*
* This function decrypts a file
@@ -498,7 +498,7 @@ class Crypt { /**
* @brief Generate a pseudo random 256-bit ASCII key, used as file key
- * @returns $key Generated key
+ * @return $key Generated key
*/
public static function generateKey() {
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php index 19b669a27ff..dea27d7a186 100644 --- a/apps/files_encryption/lib/session.php +++ b/apps/files_encryption/lib/session.php @@ -145,7 +145,7 @@ class Session { /** * @brief Gets status if we already tried to initialize the encryption app - * @returns init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED + * @return init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED * * @note this doesn not indicate of the init was successful, we just remeber the try! */ @@ -159,7 +159,7 @@ class Session { /** * @brief Gets user or public share private key from session - * @returns string $privateKey The user's plaintext private key + * @return string $privateKey The user's plaintext private key * */ public function getPrivateKey() { @@ -190,7 +190,7 @@ class Session { /** * @brief Gets public share private key from session - * @returns string $privateKey + * @return string $privateKey * */ public function getPublicSharePrivateKey() { @@ -217,7 +217,7 @@ class Session { /** * @brief Gets user legacy key from session - * @returns string $legacyKey The user's plaintext legacy key + * @return string $legacyKey The user's plaintext legacy key * */ public function getLegacyKey() { diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 37fdcaceaa5..b96e4590507 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -788,8 +788,8 @@ class Util { } if ($successful) { - $this->view->deleteAll($this->keyfilesPath); - $this->view->deleteAll($this->shareKeysPath); + $this->view->rename($this->keyfilesPath, $this->keyfilesPath . '.backup'); + $this->view->rename($this->shareKeysPath, $this->shareKeysPath . '.backup'); } \OC_FileProxy::$enabled = true; diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php index de83f6bca2b..11961f27675 100755 --- a/apps/files_encryption/tests/util.php +++ b/apps/files_encryption/tests/util.php @@ -413,8 +413,16 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { // file should no longer be encrypted $this->assertEquals(0, $fileInfoUnencrypted['encrypted']); + // check if the keys where moved to the backup location + $this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/keyfiles.backup')); + $this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/keyfiles.backup/' . $filename . '.key')); + $this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/share-keys.backup')); + $this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/share-keys.backup/' . $filename . '.' . $user . '.shareKey')); + // cleanup $this->view->unlink($this->userId . '/files/' . $filename); + $this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup'); + $this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup'); OC_App::enable('files_encryption'); } @@ -485,8 +493,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { $this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/keyfiles/')); $this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/share-keys/')); + //cleanup $this->view->unlink($this->userId . '/files/' . $file1); $this->view->unlink($this->userId . '/files/' . $file2); + $this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup'); + $this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup'); } diff --git a/apps/files_external/l10n/ast.php b/apps/files_external/l10n/ast.php index add49819154..5ab3a00d4cd 100644 --- a/apps/files_external/l10n/ast.php +++ b/apps/files_external/l10n/ast.php @@ -2,16 +2,68 @@ $TRANSLATIONS = array( "Local" => "Llocal", "Location" => "Llocalización", +"Amazon S3" => "Amazon S3", +"Key" => "Clave", +"Secret" => "Secretu", +"Bucket" => "Depósitu", +"Amazon S3 and compliant" => "Amazon S3 y compatibilidá", +"Access Key" => "Clave d'accesu", +"Secret Key" => "Clave Secreta", +"Hostname (optional)" => "Nome d'equipu (opcional)", +"Port (optional)" => "Puertu (opcional)", +"Region (optional)" => "Rexón (opcional)", +"Enable SSL" => "Habilitar SSL", +"Enable Path Style" => "Habilitar Estilu de ruta", +"App key" => "App principal", +"App secret" => "App secreta", "URL" => "URL", "Username" => "Nome d'usuariu", "Password" => "Contraseña", +"Root" => "RaÃz", +"Secure ftps://" => "Secure ftps://", +"Client ID" => "ID de veceru", +"Client secret" => "Veceru secretu", +"OpenStack Object Storage" => "OpenStack Object Storage", +"Username (required)" => "Nome d'usuariu (necesariu)", +"Bucket (required)" => "Depósitu (necesariu)", +"Region (optional for OpenStack Object Storage)" => "Rexón (opcional pa OpenStack Object Storage)", +"API Key (required for Rackspace Cloud Files)" => "Clave API (necesaria pa Rackspace Cloud Files)", +"Tenantname (required for OpenStack Object Storage)" => "Nome d'inquilÃn (necesariu pa OpenStack Object Storage)", +"Password (required for OpenStack Object Storage)" => "Contraseña (necesaria pa OpenStack Object Storage)", +"Service Name (required for OpenStack Object Storage)" => "Nome de Serviciu (necesariu pa OpenStack Object Storage)", +"URL of identity endpoint (required for OpenStack Object Storage)" => "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)", +"Timeout of HTTP requests in seconds (optional)" => "Tiempu d'espera de peticiones HTTP en segundos (opcional)", "Share" => "Compartir", +"SMB / CIFS using OC login" => "SMB / CIFS usando accesu OC", +"Username as share" => "Nome d'usuariu como Compartición", +"Secure https://" => "Secure https://", +"Remote subfolder" => "Subcarpeta remota", +"Access granted" => "Accesu concedÃu", +"Error configuring Dropbox storage" => "Fallu configurando l'almacenamientu de Dropbox", +"Grant access" => "Conceder accesu", +"Please provide a valid Dropbox app key and secret." => "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.", +"Error configuring Google Drive storage" => "Fallu configurando l'almacenamientu de Google Drive", "Saved" => "Guardáu", +"<b>Note:</b> " => "<b>Nota:</b> ", +" and " => "y", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale.", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale.", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale.", +"External Storage" => "Almacenamientu esternu", "Folder name" => "Nome de la carpeta", +"External storage" => "Almacenamientu esternu", "Configuration" => "Configuración", "Options" => "Opciones", +"Available for" => "Disponible pa", +"Add storage" => "Amestar almacenamientu", +"No user or group" => "Nengún usuariu o grupu", +"All Users" => "Tolos usuarios", "Groups" => "Grupos", "Users" => "Usuarios", -"Delete" => "Desaniciar" +"Delete" => "Desaniciar", +"Enable User External Storage" => "Habilitar almacenamientu esterno d'usuariu", +"Allow users to mount the following external storage" => "Permitir a los usuarios montar el siguiente almacenamientu esternu", +"SSL root certificates" => "Certificaos raÃz SSL", +"Import Root Certificate" => "Importar certificáu raÃz" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 15fbda927e0..9906b7670a8 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -400,19 +400,11 @@ class OC_Mount_Config { 'options' => self::encryptPasswords($classOptions)) ) ); + $mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL); - // Merge the new mount point into the current mount points - if (isset($mountPoints[$mountType])) { - if (isset($mountPoints[$mountType][$applicable])) { - $mountPoints[$mountType][$applicable] - = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]); - } else { - $mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount); - } - } else { - $mountPoints[$mountType] = $mount; - } + $mountPoints = self::mergeMountPoints($mountPoints, $mount, $mountType); self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints); + return self::getBackendStatus($class, $classOptions, $isPersonal); } @@ -690,6 +682,28 @@ class OC_Mount_Config { } /** + * Merges mount points + * @param array $data Existing mount points + * @param array $mountPoint New mount point + * @param string $mountType + * @return array + */ + private static function mergeMountPoints($data, $mountPoint, $mountType) { + $applicable = key($mountPoint); + if (isset($data[$mountType])) { + if (isset($data[$mountType][$applicable])) { + $data[$mountType][$applicable] + = array_merge($data[$mountType][$applicable], $mountPoint[$applicable]); + } else { + $data[$mountType] = array_merge($data[$mountType], $mountPoint); + } + } else { + $data[$mountType] = $mountPoint; + } + return $data; + } + + /** * Returns the encryption cipher */ private static function getCipher() { diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php index 438d3cc4ba3..d554d68c6bd 100644 --- a/apps/files_sharing/lib/api.php +++ b/apps/files_sharing/lib/api.php @@ -196,7 +196,7 @@ class Api { } /** - * @breif create a new share + * @brief create a new share * @param array $params * @return \OC_OCS_Result */ diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index d4a817fca34..d1ca60ff6ac 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -36,7 +36,7 @@ class Shared extends \OC\Files\Storage\Common { } /** - * @breif get id of the mount point + * @brief get id of the mount point * @return string */ public function getId() { @@ -44,7 +44,7 @@ class Shared extends \OC\Files\Storage\Common { } /** - * @breif get file cache of the shared item source + * @brief get file cache of the shared item source * @return string */ public function getSourceId() { diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 67acd5369a4..e97510dead8 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -265,7 +265,7 @@ class Storage { * @param string $uid user id from the owner of the file * @param string $filename file to find versions of, relative to the user files dir * @param string $userFullPath - * @returns array versions newest version first + * @return array versions newest version first */ public static function getVersions($uid, $filename, $userFullPath = '') { $versions = array(); diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php index 368eee1f12d..21065b65679 100644 --- a/apps/user_ldap/l10n/pt_PT.php +++ b/apps/user_ldap/l10n/pt_PT.php @@ -94,9 +94,11 @@ $TRANSLATIONS = array( "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituÃdos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP.", "Internal Username Attribute:" => "Atributo do nome de utilizador interno", "Override UUID detection" => "Passar a detecção do UUID", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados).", "UUID Attribute for Users:" => "Atributo UUID para utilizadores:", "UUID Attribute for Groups:" => "Atributo UUID para grupos:", "Username-LDAP User Mapping" => "Mapeamento do utilizador LDAP", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestÃgios em todo o lado. A limpeza dos mapeamentos não é sensÃvel à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.", "Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP", "Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP" ); diff --git a/core/css/share.css b/core/css/share.css index 4ae3b77757e..1527a3a0c0f 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -11,7 +11,7 @@ margin-right:112px; position:absolute; right:0; - width:320px; + width:420px; z-index:500; padding:16px; } diff --git a/core/css/styles.css b/core/css/styles.css index 26aaa1be944..d21e6bc6907 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -352,9 +352,9 @@ input[type="submit"].enabled { #body-login #header { padding-top: 100px; } -/* Fix background gradient */ #body-login { - background-attachment: fixed; + background-attachment: fixed; /* fix background gradient */ + height: 100%; /* fix sticky footer */ } /* Dark subtle label text */ diff --git a/core/js/config.php b/core/js/config.php index 7e23f3e2e41..9169cc14a7b 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -25,6 +25,13 @@ foreach(OC_App::getEnabledApps() as $app) { $apps_paths[$app] = OC_App::getAppWebPath($app); } +$defaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no'); +$defaultExpireDate = $enforceDefaultExpireDate = null; +if ($defaultExpireDateEnabled === 'yes') { + $defaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7'); + $enforceDefaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no'); +} + $array = array( "oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false', "oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false', @@ -67,6 +74,14 @@ $array = array( 'versionstring' => OC_Util::getVersionString(), ) ), + "oc_appconfig" => json_encode( + array("core" => array( + 'defaultExpireDateEnabled' => $defaultExpireDateEnabled, + 'defaultExpireDate' => $defaultExpireDate, + 'defaultExpireDateEnforced' => $enforceDefaultExpireDate, + ) + ) + ), "oc_defaults" => json_encode( array( 'entity' => $defaults->getEntity(), diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index 02cd6ac1466..e2433f5f980 100644 --- a/core/js/jquery.ocdialog.js +++ b/core/js/jquery.ocdialog.js @@ -67,8 +67,8 @@ self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body'); var pos = self.parent.position(); self.$dialog.css({ - left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2, - top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2 + left: pos.left + ($(window).innerWidth() - self.$dialog.outerWidth())/2, + top: pos.top + ($(window).innerHeight() - self.$dialog.outerHeight())/2 }); }); @@ -160,10 +160,16 @@ } this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body'); content_height = Math.min(content_height, this.parent.height()-20); - this.element.css({ - height: content_height + 'px', - width: this.$dialog.innerWidth()-20 + 'px' - }); + if (content_height> 0) { + this.element.css({ + height: content_height + 'px', + width: this.$dialog.innerWidth()-20 + 'px' + }); + } else { + this.element.css({ + width : this.$dialog.innerWidth() - 20 + 'px' + }); + } }, _createOverlay: function() { if(!this.options.modal) { diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 11833f12e2d..f6c17122d7d 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -19,7 +19,7 @@ * */ -/* global OC, t, alert */ +/* global OC, t, alert, $ */ /** * this class to ease the usage of jquery dialogs @@ -62,6 +62,65 @@ var OCdialogs = { this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal); }, /** + * displays prompt dialog + * @param text content of dialog + * @param title dialog title + * @param callback which will be triggered when user presses YES or NO + * (true or false would be passed to callback respectively) + * @param modal make the dialog modal + * @param name name of the input field + * @param password whether the input should be a password input + */ + prompt: function (text, title, callback, modal, name, password) { + $.when(this._getMessageTemplate()).then(function ($tmpl) { + var dialogName = 'oc-dialog-' + OCdialogs.dialogsCounter + '-content'; + var dialogId = '#' + dialogName; + var $dlg = $tmpl.octemplate({ + dialog_name: dialogName, + title : title, + message : text, + type : 'notice' + }); + var input = $('<input/>'); + input.attr('type', password ? 'password' : 'text').attr('id', dialogName + '-input'); + var label = $('<label/>').attr('for', dialogName + '-input').text(name + ': '); + $dlg.append(label); + $dlg.append(input); + if (modal === undefined) { + modal = false; + } + $('body').append($dlg); + var buttonlist = [ + { + text : t('core', 'Yes'), + click : function () { + if (callback !== undefined) { + callback(true, input.val()); + } + $(dialogId).ocdialog('close'); + }, + defaultButton: true + }, + { + text : t('core', 'No'), + click: function () { + if (callback !== undefined) { + callback(false, input.val()); + } + $(dialogId).ocdialog('close'); + } + } + ]; + + $(dialogId).ocdialog({ + closeOnEscape: true, + modal : modal, + buttons : buttonlist + }); + OCdialogs.dialogsCounter++; + }); + }, + /** * show a file picker to pick a file from * @param title dialog title * @param callback which will be triggered when user presses Choose diff --git a/core/js/share.js b/core/js/share.js index 2813570f718..9ceca85bff7 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -219,7 +219,18 @@ OC.Share={ html += '<div id="link">'; html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share link')+'</label>'; html += '<br />'; + + var defaultExpireMessage = ''; + if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnabled === 'yes') { + if (oc_appconfig.core.defaultExpireDateEnforced === 'yes') { + defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created', {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>'; + } else { + defaultExpireMessage = t('core', 'By default the public link will expire after {days} days', {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>'; + } + } + html += '<input id="linkText" type="text" readonly="readonly" />'; + html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>'; html += '<div id="linkPass">'; html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />'; @@ -239,6 +250,7 @@ OC.Share={ html += '<div id="expiration">'; html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>'; html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />'; + html += '<div id="defaultExpireMessage">'+defaultExpireMessage+'</div>'; html += '</div>'; dropDownEl = $(html); dropDownEl = dropDownEl.appendTo(appendTo); @@ -347,8 +359,8 @@ OC.Share={ } }) .data("ui-autocomplete")._renderItem = function( ul, item ) { - return $( "<li>" ) - .append( "<a>" + item.displayname + "<br>" + item.email + "</a>" ) + return $('<li>') + .append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' ) .appendTo( ul ); }; } @@ -490,19 +502,20 @@ OC.Share={ $('#linkPassText').attr('placeholder', '**********'); } $('#expiration').show(); + $('#defaultExpireMessage').show(); $('#emailPrivateLink #email').show(); $('#emailPrivateLink #emailButton').show(); $('#allowPublicUploadWrapper').show(); }, hideLink:function() { $('#linkText').hide('blind'); + $('#defaultExpireMessage').hide(); $('#showPassword').hide(); $('#showPassword+label').hide(); $('#linkPass').hide(); $('#emailPrivateLink #email').hide(); $('#emailPrivateLink #emailButton').hide(); $('#allowPublicUploadWrapper').hide(); - $('#expirationDate').hide(); }, dirname:function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, ''); @@ -734,6 +747,9 @@ $(document).ready(function() { OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error')); } $('#expirationDate').hide('blind'); + if (oc_appconfig.core.defaultExpireDateEnforced === 'no') { + $('#defaultExpireMessage'). show('blind'); + } }); } }); @@ -756,6 +772,10 @@ $(document).ready(function() { expirationDateField.tipsy({gravity: 'n', fade: true}); expirationDateField.tipsy('show'); expirationDateField.addClass('error'); + } else { + if (oc_appconfig.core.defaultExpireDateEnforced === 'no') { + $('#defaultExpireMessage'). hide('blind'); + } } }); }); diff --git a/core/l10n/ast.php b/core/l10n/ast.php index 497467b573d..a76eeb6b512 100644 --- a/core/l10n/ast.php +++ b/core/l10n/ast.php @@ -33,9 +33,9 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("fai %n mes","fai %n meses"), "last year" => "añu caberu", "years ago" => "fai años", -"Choose" => "Esbillar", "Yes" => "SÃ", "No" => "Non", +"Choose" => "Esbillar", "Ok" => "Aceutar", "_{count} file conflict_::_{count} file conflicts_" => array("",""), "Which files do you want to keep?" => "¿Qué ficheros quies caltener?", @@ -50,10 +50,22 @@ $TRANSLATIONS = array( "Share" => "Compartir", "Error" => "Fallu", "Error while sharing" => "Fallu mientres la compartición", +"Error while unsharing" => "Fallu mientres se dexaba de compartir", +"Error while changing permissions" => "Fallu mientres camudaben los permisos", +"Shared with you and the group {group} by {owner}" => "CompartÃu contigo y col grupu {group} por {owner}", +"Shared with you by {owner}" => "CompartÃu contigo por {owner}", "Share link" => "Compartir enllaz", +"Password protect" => "Protexer con contraseña", "Password" => "Contraseña", +"Email link to person" => "Enlláz de corréu electrónicu a la persona", "Send" => "Unviar", +"Set expiration date" => "Afitar la data de caducidá", +"Expiration date" => "Data de caducidá", +"Share via email:" => "Compartir vÃa corréu electrónicu:", +"No people found" => "Nun s'atoparon persones", "group" => "grupu", +"Resharing is not allowed" => "Recompartir nun ta permitÃu", +"Shared in {item} with {user}" => "CompartÃu en {item} con {user}", "Unshare" => "Dexar de compartir", "notify by email" => "notificar per corréu", "can edit" => "pue editar", @@ -63,24 +75,51 @@ $TRANSLATIONS = array( "delete" => "desaniciar", "share" => "compartir", "Password protected" => "Contraseña protexida", +"Error unsetting expiration date" => "Fallu desafitando la data de caducidá", +"Error setting expiration date" => "Fallu afitando la fecha de caducidá", +"Sending ..." => "Unviando ...", "Email sent" => "Corréu unviáu", "Warning" => "Avisu", "The object type is not specified." => "El tipu d'oxetu nun ta especificáu.", "Delete" => "Desaniciar", "Add" => "Amestar", "Edit tags" => "Editar etiquetes", +"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'anovamientu fÃzose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>.", +"The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fÃzose con ésitu. Redirixiendo agora al to ownCloud.", +"Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}", +"You will receive a link to reset your password via Email." => "Vas recibir un enllaz vÃa Corréu-e pa restablecer la to contraseña", "Username" => "Nome d'usuariu", "Reset" => "Reaniciar", +"Your password was reset" => "Restablecióse la contraseña", +"To login page" => "Aniciar sesión na páxina", "New password" => "Contraseña nueva", +"Reset password" => "Restablecer contraseña", "For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.", "Personal" => "Personal", "Users" => "Usuarios", +"Apps" => "Aplicaciones", +"Admin" => "Alministrador", "Help" => "Ayuda", +"Access forbidden" => "Accesu denegáu", +"Cloud not found" => "Ñube non atopada", "Cheers!" => "¡Salú!", "Security Warning" => "Avisu de seguridá", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ensin un xenerador de númberos al debalu, un atacante podrÃa aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.", +"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta d'alministrador</strong>", +"Data folder" => "Carpeta de datos", +"Configure the database" => "Configura la base de datos", "will be used" => "usaráse", +"Database user" => "Usuariu de la base de datos", +"Database password" => "Contraseña de la base de datos", +"Database name" => "Nome de la base de datos", +"Database tablespace" => "Espaciu de tables de la base de datos", +"Database host" => "Agospiador de la base de datos", +"Finish setup" => "Finar la configuración ", "Finishing …" => "Finando ...", "Log out" => "Zarrar sesión", +"Automatic logon rejected!" => "¡Aniciu de sesión automáticu refugáu!", "Lost your password?" => "¿Escaeciesti la to contraseña?", "Log in" => "Aniciar sesión", "Alternative Logins" => "Anicios de sesión alternativos", diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po index df5507bffcf..b78298d0ec7 100644 --- a/l10n/ach/settings.po +++ b/l10n/ach/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po index 4117495a19a..1091fe195d3 100644 --- a/l10n/ady/settings.po +++ b/l10n/ady/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po index 4fc292f2add..3f32827eff8 100644 --- a/l10n/af_ZA/settings.po +++ b/l10n/af_ZA/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "So-so wagwoord" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ak/settings.po b/l10n/ak/settings.po index 300b60d574a..09116dd0e53 100644 --- a/l10n/ak/settings.po +++ b/l10n/ak/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/am_ET/settings.po b/l10n/am_ET/settings.po index 95550014716..df1a06cb32b 100644 --- a/l10n/am_ET/settings.po +++ b/l10n/am_ET/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index c5f1c2a04d1..fd0c1b248fd 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "وضعية الإرسال" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "التشÙير" @@ -101,6 +101,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "تم ØÙظ البريد الإلكتروني" @@ -117,6 +127,16 @@ msgstr "Ùشل إزالة المجموعة" msgid "Unable to delete user" msgstr "Ùشل إزالة المستخدم" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "تم تغيير اللغة" @@ -228,34 +248,42 @@ msgstr "Øدث" msgid "Updated" msgstr "تم التØديث بنجاØ" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "اختر صورة المل٠الشخصي " -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "كلمة السر ضعيÙØ© جدا" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "كلمة السر ضعيÙØ©" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "كلمة السر جيدة" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "كلمة السر قوية" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "ÙÙƒ تشÙير الملÙات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "تم الØØ°Ù" @@ -301,7 +329,7 @@ msgstr "يجب ادخال كلمة مرور صØÙŠØØ©" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "تØذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -626,11 +654,11 @@ msgstr "المزيد" msgid "Less" msgstr "أقل" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "إصدار" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "استخدم هذا العنوان لـ <a href=\"%s\" target=\"_blank\">الدخول الى ملÙاتك عن طريق WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "البرنامج المشÙر لم يعد Ù…Ùعل, يرجى ÙÙƒ التشÙير عن كل ملÙاتك" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "كلمه سر الدخول" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "ÙÙƒ تشÙير جميع الملÙات " +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "اسم الدخول" diff --git a/l10n/ast/core.po b/l10n/ast/core.po index 7cc8da8adfa..c542ca0e846 100644 --- a/l10n/ast/core.po +++ b/l10n/ast/core.po @@ -4,14 +4,15 @@ # # Translators: # dixebra <davidlopezcastanon@gmail.com>, 2014 +# Iñigo Varela <ivarela@softastur.org>, 2014 # Tornes Llume <l.lumex03.tornes@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-13 01:55-0400\n" -"PO-Revision-Date: 2014-05-12 15:40+0000\n" -"Last-Translator: dixebra <davidlopezcastanon@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 19:41+0000\n" +"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -192,75 +193,75 @@ msgstr "añu caberu" msgid "years ago" msgstr "fai años" -#: js/oc-dialogs.js:125 -msgid "Choose" -msgstr "Esbillar" - -#: js/oc-dialogs.js:151 -msgid "Error loading file picker template: {error}" -msgstr "" - -#: js/oc-dialogs.js:177 +#: js/oc-dialogs.js:95 js/oc-dialogs.js:236 msgid "Yes" msgstr "SÃ" -#: js/oc-dialogs.js:187 +#: js/oc-dialogs.js:105 js/oc-dialogs.js:246 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:204 +#: js/oc-dialogs.js:184 +msgid "Choose" +msgstr "Esbillar" + +#: js/oc-dialogs.js:210 +msgid "Error loading file picker template: {error}" +msgstr "" + +#: js/oc-dialogs.js:263 msgid "Ok" msgstr "Aceutar" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:283 msgid "Error loading message template: {error}" msgstr "" -#: js/oc-dialogs.js:352 +#: js/oc-dialogs.js:411 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "" msgstr[1] "" -#: js/oc-dialogs.js:366 +#: js/oc-dialogs.js:425 msgid "One file conflict" msgstr "" -#: js/oc-dialogs.js:372 +#: js/oc-dialogs.js:431 msgid "New Files" msgstr "" -#: js/oc-dialogs.js:373 +#: js/oc-dialogs.js:432 msgid "Already existing files" msgstr "" -#: js/oc-dialogs.js:375 +#: js/oc-dialogs.js:434 msgid "Which files do you want to keep?" msgstr "¿Qué ficheros quies caltener?" -#: js/oc-dialogs.js:376 +#: js/oc-dialogs.js:435 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "" -#: js/oc-dialogs.js:384 +#: js/oc-dialogs.js:443 msgid "Cancel" msgstr "Encaboxar" -#: js/oc-dialogs.js:394 +#: js/oc-dialogs.js:453 msgid "Continue" msgstr "Continuar" -#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 +#: js/oc-dialogs.js:500 js/oc-dialogs.js:513 msgid "(all selected)" msgstr "" -#: js/oc-dialogs.js:444 js/oc-dialogs.js:458 +#: js/oc-dialogs.js:503 js/oc-dialogs.js:517 msgid "({count} selected)" msgstr "" -#: js/oc-dialogs.js:466 +#: js/oc-dialogs.js:525 msgid "Error loading file exists template" msgstr "" @@ -303,19 +304,19 @@ msgstr "Fallu mientres la compartición" #: js/share.js:171 msgid "Error while unsharing" -msgstr "" +msgstr "Fallu mientres se dexaba de compartir" #: js/share.js:178 msgid "Error while changing permissions" -msgstr "" +msgstr "Fallu mientres camudaben los permisos" #: js/share.js:188 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "CompartÃu contigo y col grupu {group} por {owner}" #: js/share.js:190 msgid "Shared with you by {owner}" -msgstr "" +msgstr "CompartÃu contigo por {owner}" #: js/share.js:214 msgid "Share with user or group …" @@ -327,7 +328,7 @@ msgstr "Compartir enllaz" #: js/share.js:223 msgid "Password protect" -msgstr "" +msgstr "Protexer con contraseña" #: js/share.js:225 templates/installation.php:60 templates/login.php:40 msgid "Password" @@ -339,7 +340,7 @@ msgstr "" #: js/share.js:234 msgid "Email link to person" -msgstr "" +msgstr "Enlláz de corréu electrónicu a la persona" #: js/share.js:235 msgid "Send" @@ -347,19 +348,19 @@ msgstr "Unviar" #: js/share.js:240 msgid "Set expiration date" -msgstr "" +msgstr "Afitar la data de caducidá" #: js/share.js:241 msgid "Expiration date" -msgstr "" +msgstr "Data de caducidá" #: js/share.js:277 msgid "Share via email:" -msgstr "" +msgstr "Compartir vÃa corréu electrónicu:" #: js/share.js:280 msgid "No people found" -msgstr "" +msgstr "Nun s'atoparon persones" #: js/share.js:324 js/share.js:385 msgid "group" @@ -367,11 +368,11 @@ msgstr "grupu" #: js/share.js:357 msgid "Resharing is not allowed" -msgstr "" +msgstr "Recompartir nun ta permitÃu" #: js/share.js:401 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "CompartÃu en {item} con {user}" #: js/share.js:423 msgid "Unshare" @@ -411,15 +412,15 @@ msgstr "Contraseña protexida" #: js/share.js:734 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Fallu desafitando la data de caducidá" #: js/share.js:752 msgid "Error setting expiration date" -msgstr "" +msgstr "Fallu afitando la fecha de caducidá" #: js/share.js:777 msgid "Sending ..." -msgstr "" +msgstr "Unviando ..." #: js/share.js:788 msgid "Email sent" @@ -466,11 +467,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the <a " "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " "community</a>." -msgstr "" +msgstr "L'anovamientu fÃzose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>." #: js/update.js:21 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "L'anovamientu fÃzose con ésitu. Redirixiendo agora al to ownCloud." #: lostpassword/controller.php:70 #, php-format @@ -485,7 +486,7 @@ msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "" +msgstr "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}" #: lostpassword/templates/lostpassword.php:7 msgid "" @@ -500,7 +501,7 @@ msgstr "" #: lostpassword/templates/lostpassword.php:18 msgid "You will receive a link to reset your password via Email." -msgstr "" +msgstr "Vas recibir un enllaz vÃa Corréu-e pa restablecer la to contraseña" #: lostpassword/templates/lostpassword.php:21 templates/installation.php:53 #: templates/login.php:32 @@ -525,11 +526,11 @@ msgstr "Reaniciar" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" -msgstr "" +msgstr "Restablecióse la contraseña" #: lostpassword/templates/resetpassword.php:5 msgid "To login page" -msgstr "" +msgstr "Aniciar sesión na páxina" #: lostpassword/templates/resetpassword.php:8 msgid "New password" @@ -537,7 +538,7 @@ msgstr "Contraseña nueva" #: lostpassword/templates/resetpassword.php:11 msgid "Reset password" -msgstr "" +msgstr "Restablecer contraseña" #: setup/controller.php:140 #, php-format @@ -561,11 +562,11 @@ msgstr "Usuarios" #: strings.php:7 templates/layout.user.php:116 msgid "Apps" -msgstr "" +msgstr "Aplicaciones" #: strings.php:8 msgid "Admin" -msgstr "" +msgstr "Alministrador" #: strings.php:9 msgid "Help" @@ -601,11 +602,11 @@ msgstr "" #: templates/403.php:12 msgid "Access forbidden" -msgstr "" +msgstr "Accesu denegáu" #: templates/404.php:15 msgid "Cloud not found" -msgstr "" +msgstr "Ñube non atopada" #: templates/altmail.php:2 #, php-format @@ -644,19 +645,19 @@ msgstr "" msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL." #: templates/installation.php:34 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "" +msgstr "Ensin un xenerador de númberos al debalu, un atacante podrÃa aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta." #: templates/installation.php:40 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula." #: templates/installation.php:42 #, php-format @@ -667,7 +668,7 @@ msgstr "" #: templates/installation.php:48 msgid "Create an <strong>admin account</strong>" -msgstr "" +msgstr "Crea una <strong>cuenta d'alministrador</strong>" #: templates/installation.php:70 msgid "Storage & database" @@ -675,11 +676,11 @@ msgstr "" #: templates/installation.php:77 msgid "Data folder" -msgstr "" +msgstr "Carpeta de datos" #: templates/installation.php:90 msgid "Configure the database" -msgstr "" +msgstr "Configura la base de datos" #: templates/installation.php:94 msgid "will be used" @@ -687,27 +688,27 @@ msgstr "usaráse" #: templates/installation.php:109 msgid "Database user" -msgstr "" +msgstr "Usuariu de la base de datos" #: templates/installation.php:118 msgid "Database password" -msgstr "" +msgstr "Contraseña de la base de datos" #: templates/installation.php:123 msgid "Database name" -msgstr "" +msgstr "Nome de la base de datos" #: templates/installation.php:132 msgid "Database tablespace" -msgstr "" +msgstr "Espaciu de tables de la base de datos" #: templates/installation.php:140 msgid "Database host" -msgstr "" +msgstr "Agospiador de la base de datos" #: templates/installation.php:150 msgid "Finish setup" -msgstr "" +msgstr "Finar la configuración " #: templates/installation.php:150 msgid "Finishing …" @@ -731,7 +732,7 @@ msgstr "Zarrar sesión" #: templates/login.php:9 msgid "Automatic logon rejected!" -msgstr "" +msgstr "¡Aniciu de sesión automáticu refugáu!" #: templates/login.php:10 msgid "" diff --git a/l10n/ast/files_encryption.po b/l10n/ast/files_encryption.po index d15eae833fc..46a698266f2 100644 --- a/l10n/ast/files_encryption.po +++ b/l10n/ast/files_encryption.po @@ -4,12 +4,13 @@ # # Translators: # Tornes Llume <l.lumex03.tornes@gmail.com>, 2014 +# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-28 01:55-0400\n" -"PO-Revision-Date: 2014-04-27 10:52+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 19:25+0000\n" "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" @@ -20,46 +21,46 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Habilitóse la recuperación de ficheros" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña." #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Clave de recuperación deshabilitada" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "Contraseña camudada esitosamente." +msgstr "Camudóse la contraseña" #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "Nun pue camudase la contraseña. Quiciabes la contraseña vieya nun fore correuta." +msgstr "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta." #: ajax/updatePrivateKeyPassword.php:52 msgid "Private key password successfully updated." -msgstr "" +msgstr "Contraseña de clave privada anovada correchamente." #: ajax/updatePrivateKeyPassword.php:54 msgid "" "Could not update the private key password. Maybe the old password was not " "correct." -msgstr "" +msgstr "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta." #: files/error.php:12 msgid "" "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." -msgstr "" +msgstr "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu." #: files/error.php:16 #, php-format @@ -67,50 +68,50 @@ msgid "" "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." -msgstr "" +msgstr "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros." #: files/error.php:19 msgid "" "Can not decrypt this file, probably this is a shared file. Please ask the " "file owner to reshare the file with you." -msgstr "" +msgstr "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartÃu. Solicita al propietariu del mesmu que vuelva a compartilu contigo." #: files/error.php:22 files/error.php:27 msgid "" "Unknown error please check your system settings or contact your " "administrator" -msgstr "" +msgstr "Fallu desconocÃu. Verifica la configuración del sistema o ponte en contautu col alministrador" #: hooks/hooks.php:64 msgid "Missing requirements." -msgstr "" +msgstr "Requisitos incompletos." #: hooks/hooks.php:65 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse." #: hooks/hooks.php:295 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Los siguientes usuarios nun se configuraron pal cifráu:" #: js/detect-migration.js:21 msgid "Initial encryption started... This can take some time. Please wait." -msgstr "" +msgstr "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera." #: js/detect-migration.js:25 msgid "Initial encryption running... Please try again later." -msgstr "" +msgstr "Cifráu inicial en cursu... Inténtalo dempués." #: templates/invalid_private_key.php:8 msgid "Go directly to your " -msgstr "" +msgstr "Dir direutamente a" #: templates/invalid_private_key.php:8 msgid "personal settings" -msgstr "axustes personales" +msgstr "opciones personales" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" @@ -119,19 +120,19 @@ msgstr "Cifráu" #: templates/settings-admin.php:5 msgid "" "Enable recovery key (allow to recover users files in case of password loss):" -msgstr "" +msgstr "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);" #: templates/settings-admin.php:9 msgid "Recovery key password" -msgstr "" +msgstr "Contraseña de clave de recuperación" #: templates/settings-admin.php:12 msgid "Repeat Recovery key password" -msgstr "" +msgstr "Repeti la contraseña de clave de recuperación" #: templates/settings-admin.php:19 templates/settings-personal.php:50 msgid "Enabled" -msgstr "Habilitáu" +msgstr "Habilitar" #: templates/settings-admin.php:27 templates/settings-personal.php:58 msgid "Disabled" @@ -139,64 +140,64 @@ msgstr "Deshabilitáu" #: templates/settings-admin.php:32 msgid "Change recovery key password:" -msgstr "" +msgstr "Camudar la contraseña de la clave de recuperación" #: templates/settings-admin.php:38 msgid "Old Recovery key password" -msgstr "" +msgstr "Clave de recuperación vieya" #: templates/settings-admin.php:45 msgid "New Recovery key password" -msgstr "" +msgstr "Clave de recuperación nueva" #: templates/settings-admin.php:51 msgid "Repeat New Recovery key password" -msgstr "" +msgstr "Repetir la clave de recuperación nueva" #: templates/settings-admin.php:56 msgid "Change Password" -msgstr "Camudar conseña" +msgstr "Camudar contraseña" #: templates/settings-personal.php:8 msgid "Your private key password no longer match your log-in password:" -msgstr "" +msgstr "La to contraseña de clave privada yá nun concasa cola contraseña d'accesu:" #: templates/settings-personal.php:11 msgid "Set your old private key password to your current log-in password." -msgstr "" +msgstr "Afitar la contraseña de la to clave privada vieya a la to contraseña actual d'accesu." #: templates/settings-personal.php:13 msgid "" " If you don't remember your old password you can ask your administrator to " "recover your files." -msgstr "Si nun recuerdes la to contraseña vieya pues entrugar al to alministrador pa recuperar los tos ficheros." +msgstr "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros." #: templates/settings-personal.php:21 msgid "Old log-in password" -msgstr "" +msgstr "Contraseña d'accesu vieya" #: templates/settings-personal.php:27 msgid "Current log-in password" -msgstr "" +msgstr "Contraseña d'accesu actual" #: templates/settings-personal.php:32 msgid "Update Private Key Password" -msgstr "" +msgstr "Anovar Contraseña de Clave Privada" #: templates/settings-personal.php:41 msgid "Enable password recovery:" -msgstr "" +msgstr "Habilitar la recuperación de contraseña:" #: templates/settings-personal.php:43 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files in case of password loss" -msgstr "" +msgstr "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña" #: templates/settings-personal.php:59 msgid "File recovery settings updated" -msgstr "" +msgstr "Opciones de recuperación de ficheros anovada" #: templates/settings-personal.php:60 msgid "Could not update file recovery" -msgstr "Nun pue anovase'l ficheru de recuperación" +msgstr "Nun pudo anovase la recuperación de ficheros" diff --git a/l10n/ast/files_external.po b/l10n/ast/files_external.po index 92d523d810b..d153f7209c3 100644 --- a/l10n/ast/files_external.po +++ b/l10n/ast/files_external.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 19:11+0000\n" +"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,59 +27,59 @@ msgstr "Llocalización" #: appinfo/app.php:39 msgid "Amazon S3" -msgstr "" +msgstr "Amazon S3" #: appinfo/app.php:41 msgid "Key" -msgstr "" +msgstr "Clave" #: appinfo/app.php:42 msgid "Secret" -msgstr "" +msgstr "Secretu" #: appinfo/app.php:43 appinfo/app.php:51 msgid "Bucket" -msgstr "" +msgstr "Depósitu" #: appinfo/app.php:47 msgid "Amazon S3 and compliant" -msgstr "" +msgstr "Amazon S3 y compatibilidá" #: appinfo/app.php:49 msgid "Access Key" -msgstr "" +msgstr "Clave d'accesu" #: appinfo/app.php:50 msgid "Secret Key" -msgstr "" +msgstr "Clave Secreta" #: appinfo/app.php:52 msgid "Hostname (optional)" -msgstr "" +msgstr "Nome d'equipu (opcional)" #: appinfo/app.php:53 msgid "Port (optional)" -msgstr "" +msgstr "Puertu (opcional)" #: appinfo/app.php:54 msgid "Region (optional)" -msgstr "" +msgstr "Rexón (opcional)" #: appinfo/app.php:55 msgid "Enable SSL" -msgstr "" +msgstr "Habilitar SSL" #: appinfo/app.php:56 msgid "Enable Path Style" -msgstr "" +msgstr "Habilitar Estilu de ruta" #: appinfo/app.php:63 msgid "App key" -msgstr "" +msgstr "App principal" #: appinfo/app.php:64 msgid "App secret" -msgstr "" +msgstr "App secreta" #: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121 #: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151 @@ -99,59 +99,59 @@ msgstr "Contraseña" #: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124 #: appinfo/app.php:134 appinfo/app.php:154 msgid "Root" -msgstr "" +msgstr "RaÃz" #: appinfo/app.php:77 msgid "Secure ftps://" -msgstr "" +msgstr "Secure ftps://" #: appinfo/app.php:84 msgid "Client ID" -msgstr "" +msgstr "ID de veceru" #: appinfo/app.php:85 msgid "Client secret" -msgstr "" +msgstr "Veceru secretu" #: appinfo/app.php:92 msgid "OpenStack Object Storage" -msgstr "" +msgstr "OpenStack Object Storage" #: appinfo/app.php:94 msgid "Username (required)" -msgstr "" +msgstr "Nome d'usuariu (necesariu)" #: appinfo/app.php:95 msgid "Bucket (required)" -msgstr "" +msgstr "Depósitu (necesariu)" #: appinfo/app.php:96 msgid "Region (optional for OpenStack Object Storage)" -msgstr "" +msgstr "Rexón (opcional pa OpenStack Object Storage)" #: appinfo/app.php:97 msgid "API Key (required for Rackspace Cloud Files)" -msgstr "" +msgstr "Clave API (necesaria pa Rackspace Cloud Files)" #: appinfo/app.php:98 msgid "Tenantname (required for OpenStack Object Storage)" -msgstr "" +msgstr "Nome d'inquilÃn (necesariu pa OpenStack Object Storage)" #: appinfo/app.php:99 msgid "Password (required for OpenStack Object Storage)" -msgstr "" +msgstr "Contraseña (necesaria pa OpenStack Object Storage)" #: appinfo/app.php:100 msgid "Service Name (required for OpenStack Object Storage)" -msgstr "" +msgstr "Nome de Serviciu (necesariu pa OpenStack Object Storage)" #: appinfo/app.php:101 msgid "URL of identity endpoint (required for OpenStack Object Storage)" -msgstr "" +msgstr "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)" #: appinfo/app.php:102 msgid "Timeout of HTTP requests in seconds (optional)" -msgstr "" +msgstr "Tiempu d'espera de peticiones HTTP en segundos (opcional)" #: appinfo/app.php:114 appinfo/app.php:123 msgid "Share" @@ -159,76 +159,76 @@ msgstr "Compartir" #: appinfo/app.php:119 msgid "SMB / CIFS using OC login" -msgstr "" +msgstr "SMB / CIFS usando accesu OC" #: appinfo/app.php:122 msgid "Username as share" -msgstr "" +msgstr "Nome d'usuariu como Compartición" #: appinfo/app.php:135 appinfo/app.php:145 msgid "Secure https://" -msgstr "" +msgstr "Secure https://" #: appinfo/app.php:144 msgid "Remote subfolder" -msgstr "" +msgstr "Subcarpeta remota" #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40 msgid "Access granted" -msgstr "" +msgstr "Accesu concedÃu" #: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103 msgid "Error configuring Dropbox storage" -msgstr "" +msgstr "Fallu configurando l'almacenamientu de Dropbox" #: js/dropbox.js:68 js/google.js:89 msgid "Grant access" -msgstr "" +msgstr "Conceder accesu" #: js/dropbox.js:102 msgid "Please provide a valid Dropbox app key and secret." -msgstr "" +msgstr "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta." #: js/google.js:45 js/google.js:122 msgid "Error configuring Google Drive storage" -msgstr "" +msgstr "Fallu configurando l'almacenamientu de Google Drive" #: js/settings.js:318 js/settings.js:325 msgid "Saved" msgstr "Guardáu" -#: lib/config.php:597 +#: lib/config.php:589 msgid "<b>Note:</b> " -msgstr "" +msgstr "<b>Nota:</b> " -#: lib/config.php:607 +#: lib/config.php:599 msgid " and " -msgstr "" +msgstr "y" -#: lib/config.php:629 +#: lib/config.php:621 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale." -#: lib/config.php:631 +#: lib/config.php:623 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale." -#: lib/config.php:633 +#: lib/config.php:625 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale." #: templates/settings.php:2 msgid "External Storage" -msgstr "" +msgstr "Almacenamientu esternu" #: templates/settings.php:8 templates/settings.php:27 msgid "Folder name" @@ -236,7 +236,7 @@ msgstr "Nome de la carpeta" #: templates/settings.php:9 msgid "External storage" -msgstr "" +msgstr "Almacenamientu esternu" #: templates/settings.php:10 msgid "Configuration" @@ -248,19 +248,19 @@ msgstr "Opciones" #: templates/settings.php:12 msgid "Available for" -msgstr "" +msgstr "Disponible pa" #: templates/settings.php:32 msgid "Add storage" -msgstr "" +msgstr "Amestar almacenamientu" #: templates/settings.php:92 msgid "No user or group" -msgstr "" +msgstr "Nengún usuariu o grupu" #: templates/settings.php:95 msgid "All Users" -msgstr "" +msgstr "Tolos usuarios" #: templates/settings.php:97 msgid "Groups" @@ -277,16 +277,16 @@ msgstr "Desaniciar" #: templates/settings.php:132 msgid "Enable User External Storage" -msgstr "" +msgstr "Habilitar almacenamientu esterno d'usuariu" #: templates/settings.php:135 msgid "Allow users to mount the following external storage" -msgstr "" +msgstr "Permitir a los usuarios montar el siguiente almacenamientu esternu" #: templates/settings.php:150 msgid "SSL root certificates" -msgstr "" +msgstr "Certificaos raÃz SSL" #: templates/settings.php:168 msgid "Import Root Certificate" -msgstr "" +msgstr "Importar certificáu raÃz" diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po index c6b34d97164..c30a8f04709 100644 --- a/l10n/ast/settings.po +++ b/l10n/ast/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,7 @@ msgstr "Tienes de configurar la direición de corréu-e enantes de poder unviar msgid "Send mode" msgstr "Mou d'unviu" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifráu" @@ -99,6 +99,16 @@ msgstr "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta c msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Corréu-e guardáu" @@ -115,6 +125,16 @@ msgstr "Nun pudo desaniciase'l grupu" msgid "Unable to delete user" msgstr "Nun pudo desaniciase l'usuariu" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Camudóse la llingua" @@ -226,34 +246,42 @@ msgstr "Anovar" msgid "Updated" msgstr "Anováu" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Esbillar una imaxe de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contraseña mui feble" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contraseña feble" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contraseña pasable" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Contraseña bona" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contraseña mui bona" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "desaniciáu" @@ -299,7 +327,7 @@ msgstr "Tien d'apurrise una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste." -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Asturianu" @@ -624,11 +652,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contraseña d'accesu" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Descifrar ficheros" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome d'usuariu" diff --git a/l10n/az/settings.po b/l10n/az/settings.po index cd3448207bd..a250f264cc2 100644 --- a/l10n/az/settings.po +++ b/l10n/az/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/be/settings.po b/l10n/be/settings.po index 8e0a3d7a13b..84c808cc31e 100644 --- a/l10n/be/settings.po +++ b/l10n/be/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index d978f54aabb..e7d3b622681 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Криптиране" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email адреÑа е запиÑан" @@ -114,6 +124,16 @@ msgstr "Ðевъзможно изтриване на група" msgid "Unable to delete user" msgstr "Ðевъзможно изтриване на потребител" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Езикът е променен" @@ -225,34 +245,42 @@ msgstr "ОбновÑване" msgid "Updated" msgstr "Обновено" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "изтрито" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "Още" msgid "Less" msgstr "По-малко" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ВерÑиÑ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Потребител" diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po index 263c0ff48bd..d9db22642ac 100644 --- a/l10n/bn_BD/settings.po +++ b/l10n/bn_BD/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "সংকেতায়ন" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ই-মেইল সংরকà§à¦·à¦¨ করা হয়েছে" @@ -114,6 +124,16 @@ msgstr "গোষà§à¦ ী মà§à¦›à§‡ ফেলা সমà§à¦à¦¬ হলো à msgid "Unable to delete user" msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ মà§à¦›à§‡ ফেলা সমà§à¦à¦¬ হলো না " +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "à¦à¦¾à¦·à¦¾ পরিবরà§à¦¤à¦¨ করা হয়েছে" @@ -225,34 +245,42 @@ msgstr "পরিবরà§à¦§à¦¨" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "বেশী" msgid "Less" msgstr "কম" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "à¦à¦¾à¦°à§à¦¸à¦¨" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "পà§à¦°à¦¬à§‡à¦¶" diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po index 484b7e50b12..7b70e2e5ffc 100644 --- a/l10n/bs/settings.po +++ b/l10n/bs/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index 3e48e8ff0ad..05c24986f05 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "Heu d'establir un nom d'usuari abans de poder enviar correus de prova." msgid "Send mode" msgstr "Mode d'enviament" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Xifrat" @@ -101,6 +101,16 @@ msgstr "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-h msgid "Couldn't decrypt your files, check your password and try again" msgstr "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "S'ha desat el correu electrònic" @@ -117,6 +127,16 @@ msgstr "No es pot eliminar el grup" msgid "Unable to delete user" msgstr "No es pot eliminar l'usuari" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "S'ha canviat l'idioma" @@ -228,34 +248,42 @@ msgstr "Actualitza" msgid "Updated" msgstr "Actualitzada" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccioneu una imatge de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contrasenya massa feble" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contrasenya feble" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contrasenya passable" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Contrasenya bona" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contrasenya forta" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "esborrat" @@ -301,7 +329,7 @@ msgstr "Heu de facilitar una contrasenya và lida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "AvÃs: la carpeta Home per l'usuari \"{user}\" ja existeix" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Català " @@ -626,11 +654,11 @@ msgstr "Més" msgid "Less" msgstr "Menys" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versió" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contrasenya d'accés" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Desencripta tots els fitxers" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nom d'accés" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 5a7f14e0536..2676c5ec817 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: pstast <petr@stastny.eu>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +59,7 @@ msgstr "Pro možnost odeslánà zkuÅ¡ebnÃch e-mailů musÃte nejprve nastavit s msgid "Send mode" msgstr "Mód odesÃlánÃ" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifrovánÃ" @@ -106,6 +106,16 @@ msgstr "Nebylo možno deÅ¡ifrovat soubory, zkontroluje prosÃm owncloud.log nebo msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nebylo možno deÅ¡ifrovat soubory, zkontrolujte své heslo a zkuste znovu" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail uložen" @@ -122,6 +132,16 @@ msgstr "Nelze smazat skupinu" msgid "Unable to delete user" msgstr "Nelze smazat uživatele" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jazyk byl zmÄ›nÄ›n" @@ -233,34 +253,42 @@ msgstr "Aktualizovat" msgid "Updated" msgstr "Aktualizováno" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Vyberte profilový obrázek" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Velmi slabé heslo" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Slabé heslo" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "StÅ™ednÄ› silné heslo" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Dobré heslo" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Silné heslo" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "ProbÃhá deÅ¡ifrovánà souborů... ÄŒekejte prosÃm, tato operace může trvat nÄ›jakou dobu." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "smazáno" @@ -306,7 +334,7 @@ msgstr "MusÃte zadat platné heslo" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "VarovánÃ: Osobnà složka uživatele \"{user}\" již existuje." -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "ÄŒesky" @@ -631,11 +659,11 @@ msgstr "VÃce" msgid "Less" msgstr "MénÄ›" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Verze" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -799,18 +827,33 @@ msgid "" "WebDAV</a>" msgstr "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro pÅ™Ãstup k vaÅ¡im souborům pÅ™es WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Å ifrovacà aplikace již nenà spuÅ¡tÄ›na, deÅ¡ifrujte prosÃm vÅ¡echny své soubory" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "PÅ™ihlaÅ¡ovacà heslo" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "OdÅ¡ifrovat vÅ¡echny soubory" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "PÅ™ihlaÅ¡ovacà jméno" diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po index 8b565719554..ad83204354b 100644 --- a/l10n/cy_GB/settings.po +++ b/l10n/cy_GB/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Amgryptiad" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Mewngofnodi" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index 6d6ae07fb36..5152ab2ff5d 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Sappe\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Kryptering" @@ -102,6 +102,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email adresse gemt" @@ -118,6 +128,16 @@ msgstr "Gruppen kan ikke slettes" msgid "Unable to delete user" msgstr "Bruger kan ikke slettes" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprog ændret" @@ -229,34 +249,42 @@ msgstr "Opdater" msgid "Updated" msgstr "Opdateret" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Vælg et profilbillede" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Meget svagt kodeord" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Svagt kodeord" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Jævnt kodeord" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Godt kodeord" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Stærkt kodeord" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. " +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "Slettet" @@ -302,7 +330,7 @@ msgstr "En gyldig adgangskode skal angives" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Dansk" @@ -627,11 +655,11 @@ msgstr "Mere" msgid "Less" msgstr "Mindre" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgÃ¥ dine filer via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Log-in kodeord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekrypter alle Filer " +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Loginnavn" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index d17fa6d83d6..0c7ad937610 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +60,7 @@ msgstr "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E msgid "Send mode" msgstr "Sende-Modus" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Verschlüsselung" @@ -107,6 +107,16 @@ msgstr "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud. msgid "Couldn't decrypt your files, check your password and try again" msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut." +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-Mail Adresse gespeichert" @@ -123,6 +133,16 @@ msgstr "Gruppe konnte nicht gelöscht werden" msgid "Unable to delete user" msgstr "Benutzer konnte nicht gelöscht werden" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprache geändert" @@ -234,34 +254,42 @@ msgstr "Aktualisierung durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Wähle ein Profilbild" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Sehr schwaches Passwort" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Schwaches Passwort" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Durchschnittliches Passwort" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Gutes Passwort" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Starkes Passwort" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "gelöscht" @@ -307,7 +335,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Deutsch (Persönlich)" @@ -632,11 +660,11 @@ msgstr "Mehr" msgid "Less" msgstr "Weniger" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -800,18 +828,33 @@ msgid "" "WebDAV</a>" msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Login-Passwort" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Alle Dateien entschlüsseln" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Loginname" diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po index 2aea78c3e37..b43ef756d29 100644 --- a/l10n/de_AT/settings.po +++ b/l10n/de_AT/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -115,6 +125,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -226,34 +246,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Deutsch (Österreich)" @@ -624,11 +652,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po index ff71e18faa0..def8f77e25e 100644 --- a/l10n/de_CH/settings.po +++ b/l10n/de_CH/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Verschlüsselung" @@ -107,6 +107,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-Mail-Adresse gespeichert" @@ -123,6 +133,16 @@ msgstr "Die Gruppe konnte nicht gelöscht werden" msgid "Unable to delete user" msgstr "Der Benutzer konnte nicht gelöscht werden" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprache geändert" @@ -234,34 +254,42 @@ msgstr "Update durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "gelöscht" @@ -307,7 +335,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Deutsch (Schweiz)" @@ -632,11 +660,11 @@ msgstr "Mehr" msgid "Less" msgstr "Weniger" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -800,18 +828,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Login-Passwort" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Alle Dateien entschlüsseln" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Loginname" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 6172c66abba..e35588609c4 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,7 +61,7 @@ msgstr "Sie müssen Ihre Benutzer-E-Mail-Adresse setzen, bevor Sie Test-E-Mails msgid "Send mode" msgstr "Sende-Modus" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Verschlüsselung" @@ -108,6 +108,16 @@ msgstr "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre ownc msgid "Couldn't decrypt your files, check your password and try again" msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut." +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-Mail-Adresse gespeichert" @@ -124,6 +134,16 @@ msgstr "Die Gruppe konnte nicht gelöscht werden" msgid "Unable to delete user" msgstr "Der Benutzer konnte nicht gelöscht werden" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprache geändert" @@ -235,34 +255,42 @@ msgstr "Update durchführen" msgid "Updated" msgstr "Aktualisiert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Wählen Sie ein Profilbild" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Sehr schwaches Passwort" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Schwaches Passwort" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Passables Passwort" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Gutes Passwort" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Starkes Passwort" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "gelöscht" @@ -308,7 +336,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Deutsch (Förmlich: Sie)" @@ -633,11 +661,11 @@ msgstr "Mehr" msgid "Less" msgstr "Weniger" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -801,18 +829,33 @@ msgid "" "WebDAV</a>" msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Login-Passwort" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Alle Dateien entschlüsseln" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Loginname" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 0622b53d030..0b1b8f0f0be 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-12 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 18:20+0000\n" -"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +60,7 @@ msgstr "Î ÏÎπει να οÏίσετε το email του χÏήστη Ï€Ïιν msgid "Send mode" msgstr "Κατάσταση αποστολής" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ΚÏυπτογÏάφηση" @@ -107,6 +107,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Το email αποθηκεÏτηκε " @@ -123,6 +133,16 @@ msgstr "Αδυναμία διαγÏαφής ομάδας" msgid "Unable to delete user" msgstr "Αδυναμία διαγÏαφής χÏήστη" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Η γλώσσα άλλαξε" @@ -234,34 +254,42 @@ msgstr "ΕνημÎÏωση" msgid "Updated" msgstr "ΕνημεÏώθηκε" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Επιλογή εικόνας Ï€Ïοφίλ" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Î Î¿Î»Ï Î±Î´Ïναμο συνθηματικό" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "ΑδÏναμο συνθηματικό" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "ÎœÎÏ„Ïιο συνθηματικό" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Καλό συνθηματικό" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Δυνατό συνθηματικό" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "ΑποκÏυπτογÏάφηση αÏχείων... ΠαÏακαλώ πεÏιμÎνετε, αυτό μποÏεί να πάÏει κάποιο χÏόνο." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "διαγÏάφηκε" @@ -307,7 +335,7 @@ msgstr "Î ÏÎπει να δοθεί ÎγκυÏο συνθηματικό" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Î Ïοειδοποίηση: Ο μητÏικός κατάλογος του χÏήστη \"{user}\" υπάÏχει ήδη" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__όνομα_γλώσσας__" @@ -632,11 +660,11 @@ msgstr "ΠεÏισσότεÏα" msgid "Less" msgstr "ΛιγότεÏα" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Έκδοση" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -800,18 +828,33 @@ msgid "" "WebDAV</a>" msgstr "ΧÏησιμοποιήστε αυτήν την διεÏθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">Ï€Ïόσβαση στα αÏχεία σας μÎσω WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Η εφαÏμογή κÏυπτογÏάφησης δεν είναι πλÎον ενεÏγοποιημÎνη, παÏακαλώ αποκÏυπτογÏαφήστε όλα τα αÏχεία σας" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Συνθηματικό εισόδου" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "ΑποκÏυπτογÏάφηση όλων των ΑÏχείων" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Όνομα ΣÏνδεσης" diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po index 1c79ee79e63..499be02a591 100644 --- a/l10n/en@pirate/settings.po +++ b/l10n/en@pirate/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po index 99c633ae0de..3b7c741141a 100644 --- a/l10n/en_GB/settings.po +++ b/l10n/en_GB/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: mnestis <transifex@mnestis.net>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,7 @@ msgstr "You need to set your user email before being able to send test emails." msgid "Send mode" msgstr "Send mode" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Encryption" @@ -99,6 +99,16 @@ msgstr "Couldn't decrypt your files, please check your owncloud.log or ask your msgid "Couldn't decrypt your files, check your password and try again" msgstr "Couldn't decrypt your files, check your password and try again" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email saved" @@ -115,6 +125,16 @@ msgstr "Unable to delete group" msgid "Unable to delete user" msgstr "Unable to delete user" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Language changed" @@ -226,34 +246,42 @@ msgstr "Update" msgid "Updated" msgstr "Updated" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Select a profile picture" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Very weak password" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Weak password" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "So-so password" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Good password" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Strong password" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decrypting files... Please wait, this can take some time." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "deleted" @@ -299,7 +327,7 @@ msgstr "A valid password must be provided" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Warning: Home directory for user \"{user}\" already exists" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "English (British English)" @@ -624,11 +652,11 @@ msgstr "More" msgid "Less" msgstr "Less" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "The encryption app is no longer enabled, please decrypt all your files" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Log-in password" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decrypt all Files" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Login Name" diff --git a/l10n/en_NZ/settings.po b/l10n/en_NZ/settings.po index 2d4a57c17ea..ffa919a6af4 100644 --- a/l10n/en_NZ/settings.po +++ b/l10n/en_NZ/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index 6058594a1dd..6c9c1ef9995 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Ĉifrado" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "La retpoÅtadreso konserviÄis" @@ -114,6 +124,16 @@ msgstr "Ne eblis forigi la grupon" msgid "Unable to delete user" msgstr "Ne eblis forigi la uzanton" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "La lingvo estas ÅanÄita" @@ -225,34 +245,42 @@ msgstr "Äœisdatigi" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "forigita" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Esperanto" @@ -623,11 +651,11 @@ msgstr "Pli" msgid "Less" msgstr "Malpli" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Eldono" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Ensaluti" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index d79aaecea9d..3ef0d924efc 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -22,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +66,7 @@ msgstr "Tiene que configurar su dirección de correo electrónico antes de poder msgid "Send mode" msgstr "Modo de envÃo" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifrado" @@ -113,6 +113,16 @@ msgstr "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con msgid "Couldn't decrypt your files, check your password and try again" msgstr "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Correo electrónico guardado" @@ -129,6 +139,16 @@ msgstr "No se pudo eliminar el grupo" msgid "Unable to delete user" msgstr "No se pudo eliminar el usuario" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma cambiado" @@ -240,34 +260,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccionar una imagen de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contraseña muy débil" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contraseña débil" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contraseña pasable" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Contraseña buena" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contraseña muy buena" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eliminado" @@ -313,7 +341,7 @@ msgstr "Se debe proporcionar una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe." -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Castellano" @@ -638,11 +666,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -806,18 +834,33 @@ msgid "" "WebDAV</a>" msgstr "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "La aplicación de cifrado ya no está activada, descifre todos sus archivos" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contraseña de acceso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Descifrar archivos" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nombre de usuario" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index de6bc460616..5bdf707f1d6 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "Necesita especificar el usuario de correo electrónico antes de poder en msgid "Send mode" msgstr "Modo de envio" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Encriptación" @@ -102,6 +102,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "e-mail guardado" @@ -118,6 +128,16 @@ msgstr "No fue posible borrar el grupo" msgid "Unable to delete user" msgstr "No fue posible borrar el usuario" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma cambiado" @@ -229,34 +249,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccionar una imágen de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contraseña muy débil." -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contraseña débil." -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contraseña de nivel medio. " -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Buena contraseña. " -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contraseña fuerte." -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Desencriptando archivos... Por favor espere, esto puede tardar." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "borrado" @@ -302,7 +330,7 @@ msgstr "Debe ingresar una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Advertencia: El directorio Home del usuario \"{user}\" ya existe" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Castellano (Argentina)" @@ -627,11 +655,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vÃa WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Clave de acceso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Desencriptar todos los archivos" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nombre de Usuario" diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po index d888d0ab373..48192c10266 100644 --- a/l10n/es_CL/settings.po +++ b/l10n/es_CL/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/es_CO/settings.po b/l10n/es_CO/settings.po index 090be92396e..318732bf0fe 100644 --- a/l10n/es_CO/settings.po +++ b/l10n/es_CO/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-10 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/es_CR/settings.po b/l10n/es_CR/settings.po index 2720f550634..22ab9f64d31 100644 --- a/l10n/es_CR/settings.po +++ b/l10n/es_CR/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/es_EC/settings.po b/l10n/es_EC/settings.po index 7ee393c3f1b..c12f94eaa40 100644 --- a/l10n/es_EC/settings.po +++ b/l10n/es_EC/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-10 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po index d25e78d7cec..a9128ba63af 100644 --- a/l10n/es_MX/settings.po +++ b/l10n/es_MX/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifrado" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Correo electrónico guardado" @@ -114,6 +124,16 @@ msgstr "No se pudo eliminar el grupo" msgid "Unable to delete user" msgstr "No se pudo eliminar el usuario" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma cambiado" @@ -225,34 +245,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccionar una imagen de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eliminado" @@ -298,7 +326,7 @@ msgstr "Se debe proporcionar una contraseña válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe." -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Español (México)" @@ -623,11 +651,11 @@ msgstr "Más" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vÃa WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "La aplicación de cifrado ya no está activada, descifre todos sus archivos" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contraseña de acceso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Descifrar archivos" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nombre de usuario" diff --git a/l10n/es_PE/settings.po b/l10n/es_PE/settings.po index 464b836770d..e23dbcbe647 100644 --- a/l10n/es_PE/settings.po +++ b/l10n/es_PE/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-10 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/es_UY/settings.po b/l10n/es_UY/settings.po index 2a4eca8e8be..01bcab96d7e 100644 --- a/l10n/es_UY/settings.po +++ b/l10n/es_UY/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-10 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 4d1f5712fbb..145b0f1635f 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "Pead seadistama oma e-postienne kui on võimalik saata test-kirju." msgid "Send mode" msgstr "Saatmise viis" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Krüpteerimine" @@ -100,6 +100,16 @@ msgstr "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või msgid "Couldn't decrypt your files, check your password and try again" msgstr "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Kiri on salvestatud" @@ -116,6 +126,16 @@ msgstr "Grupi kustutamine ebaõnnestus" msgid "Unable to delete user" msgstr "Kasutaja kustutamine ebaõnnestus" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Keel on muudetud" @@ -227,34 +247,42 @@ msgstr "Uuenda" msgid "Updated" msgstr "Uuendatud" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Vali profiili pilt" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Väga nõrk parool" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Nõrk parool" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Enam-vähem sobiv parool" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Hea parool" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Väga hea parool" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "kustutatud" @@ -300,7 +328,7 @@ msgstr "Sisesta nõuetele vastav parool" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Eesti" @@ -625,11 +653,11 @@ msgstr "Rohkem" msgid "Less" msgstr "Vähem" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versioon" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Sisselogimise parool" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekrüpteeri kõik failid" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Kasutajanimi" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index c0570dc4556..962746ae2da 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Enkriptazioa" @@ -101,6 +101,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Eposta gorde da" @@ -117,6 +127,16 @@ msgstr "Ezin izan da taldea ezabatu" msgid "Unable to delete user" msgstr "Ezin izan da erabiltzailea ezabatu" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Hizkuntza aldatuta" @@ -228,34 +248,42 @@ msgstr "Eguneratu" msgid "Updated" msgstr "Eguneratuta" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Profil argazkia aukeratu" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ezabatuta" @@ -301,7 +329,7 @@ msgstr "Baliozko pasahitza eman behar da" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Euskera" @@ -626,11 +654,11 @@ msgstr "Gehiago" msgid "Less" msgstr "Gutxiago" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Bertsioa" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Saioa hasteko pasahitza" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Desenkripattu fitxategi guztiak" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Sarrera Izena" diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po index ce42674fd78..9b588cb92d1 100644 --- a/l10n/eu_ES/settings.po +++ b/l10n/eu_ES/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 747dea0bf49..48968e563ee 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "رمزگذاری" @@ -101,6 +101,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ایمیل ذخیره شد" @@ -117,6 +127,16 @@ msgstr "Øذ٠گروه امکان پذیر نیست" msgid "Unable to delete user" msgstr "Øذ٠کاربر امکان پذیر نیست" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "زبان تغییر کرد" @@ -228,34 +248,42 @@ msgstr "به روز رسانی" msgid "Updated" msgstr "بروز رسانی انجام شد" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "انتخاب تصویر پروÙایل" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "در Øال بازگشایی رمز Ùایل‌ها... لطÙاً صبر نمایید. این امر ممکن است مدتی زمان ببرد." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "Øذ٠شده" @@ -301,7 +329,7 @@ msgstr "رمز عبور صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در Øال Øاضر وجود دارد" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -626,11 +654,11 @@ msgstr "بیش‌تر" msgid "Less" msgstr "کم‌تر" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "نسخه" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "از این آدرس استÙاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به Ùایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "رمز ورود" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "تمام Ùایلها رمزگشایی شود" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "نام کاربری" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 20c7f2a712d..d08fd530c05 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,7 @@ msgstr "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta." msgid "Send mode" msgstr "Lähetystila" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Salaus" @@ -99,6 +99,16 @@ msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tie msgid "Couldn't decrypt your files, check your password and try again" msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Sähköposti tallennettu" @@ -115,6 +125,16 @@ msgstr "Ryhmän poisto epäonnistui" msgid "Unable to delete user" msgstr "Käyttäjän poisto epäonnistui" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Kieli on vaihdettu" @@ -226,34 +246,42 @@ msgstr "Päivitä" msgid "Updated" msgstr "Päivitetty" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Valitse profiilikuva" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Erittäin heikko salasana" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Heikko salasana" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Kohtalainen salasana" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Hyvä salasana" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Vahva salasana" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "poistettu" @@ -299,7 +327,7 @@ msgstr "Anna kelvollinen salasana" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "_kielen_nimi_" @@ -624,11 +652,11 @@ msgstr "Enemmän" msgid "Less" msgstr "Vähemmän" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versio" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Kirjautumissalasana" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Pura kaikkien tiedostojen salaus" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Kirjautumisnimi" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 678357f2cbd..110a55e4ae0 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: ptit_boogy <ptit.boogy@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,7 +63,7 @@ msgstr "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoye msgid "Send mode" msgstr "Mode d'envoi" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Chiffrement" @@ -110,6 +110,16 @@ msgstr "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud msgid "Couldn't decrypt your files, check your password and try again" msgstr "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail sauvegardé" @@ -126,6 +136,16 @@ msgstr "Impossible de supprimer le groupe" msgid "Unable to delete user" msgstr "Impossible de supprimer l'utilisateur" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Langue changée" @@ -237,34 +257,42 @@ msgstr "Mettre à jour" msgid "Updated" msgstr "Mise à jour effectuée avec succès" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Selectionner une photo de profil " -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Mot de passe de très faible sécurité" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Mot de passe de faible sécurité" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Mot de passe de sécurité tout juste acceptable" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Mot de passe de sécurité suffisante" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Mot de passe de forte sécurité" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Déchiffrement en cours... Cela peut prendre un certain temps." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "supprimé" @@ -310,7 +338,7 @@ msgstr "Un mot de passe valide doit être saisi" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà " -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Français" @@ -635,11 +663,11 @@ msgstr "Plus" msgid "Less" msgstr "Moins" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -803,18 +831,33 @@ msgid "" "WebDAV</a>" msgstr "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Mot de passe de connexion" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Déchiffrer tous les fichiers" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nom d'utilisateur" diff --git a/l10n/fr_CA/settings.po b/l10n/fr_CA/settings.po index 951ff58a54c..5db75bf8c1f 100644 --- a/l10n/fr_CA/settings.po +++ b/l10n/fr_CA/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index 9a8a1b95539..6316b5a4d03 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: mbouzada <mbouzada@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +53,7 @@ msgstr "É necesario configurar o correo do usuario antes de poder enviar mensax msgid "Send mode" msgstr "Modo de envÃo" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifrado" @@ -100,6 +100,16 @@ msgstr "Non foi posÃbel descifrar os seus ficheiros. revise o ficheiro de rexis msgid "Couldn't decrypt your files, check your password and try again" msgstr "Non foi posÃbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Correo gardado" @@ -116,6 +126,16 @@ msgstr "Non é posÃbel eliminar o grupo." msgid "Unable to delete user" msgstr "Non é posÃbel eliminar o usuario" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "O idioma cambiou" @@ -227,34 +247,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccione unha imaxe para o perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contrasinal moi feble" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contrasinal feble" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contrasinal non moi aló" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Bo contrasinal" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contrasinal forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Descifrando ficheiros... isto pode levar un anaco." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eliminado" @@ -300,7 +328,7 @@ msgstr "Debe fornecer un contrasinal" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Aviso: O directorio persoal para o usuario «{user}» xa existe" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Galego" @@ -625,11 +653,11 @@ msgstr "Máis" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versión" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "Empregue esta ligazón <a href=\"%s\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "O aplicativo de cifrado non está activado, descifre todos os ficheiros" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Contrasinal de acceso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Descifrar todos os ficheiros" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome de acceso" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 95a9963d1be..713c768cdb6 100644 --- a/l10n/he/settings.po +++ b/l10n/he/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "×”×¦×¤× ×”" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "הדו×״ל × ×©×ž×¨" @@ -115,6 +125,16 @@ msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת הקבוצה" msgid "Unable to delete user" msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת המשתמש" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "שפה ×”×©×ª× ×ª×”" @@ -226,34 +246,42 @@ msgstr "עדכון" msgid "Updated" msgstr "מעודכן" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "× ×ž×—×§" @@ -299,7 +327,7 @@ msgstr "יש לספק ססמה ×ª×§× ×™×ª" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "עברית" @@ -624,11 +652,11 @@ msgstr "יותר" msgid "Less" msgstr "פחות" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "גרס×" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "×©× ×›× ×™×¡×”" diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po index 16803dc3300..d6f29585089 100644 --- a/l10n/hi/settings.po +++ b/l10n/hi/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "अदà¥à¤¯à¤¤à¤¨" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/hi_IN/settings.po b/l10n/hi_IN/settings.po index 148419f9261..638580cdb7e 100644 --- a/l10n/hi_IN/settings.po +++ b/l10n/hi_IN/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-30 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index 8e39fbeabe4..4efb1c3b409 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email spremljen" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jezik promijenjen" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "izbrisano" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__ime_jezika__" @@ -623,11 +651,11 @@ msgstr "viÅ¡e" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Prijava" diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index 352ef2f1cc4..5fc29a27b06 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: ebela <bela@dandre.hu>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "TitkosÃtás" @@ -102,6 +102,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email mentve" @@ -118,6 +128,16 @@ msgstr "A csoport nem törölhetÅ‘" msgid "Unable to delete user" msgstr "A felhasználó nem törölhetÅ‘" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "A nyelv megváltozott" @@ -229,34 +249,42 @@ msgstr "FrissÃtés" msgid "Updated" msgstr "FrissÃtve" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Válassz profil képet" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Nagyon gyenge jelszó" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Gyenge jelszó" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Nem túl jó jelszó" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Jó jelszó" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "ErÅ‘s jelszó" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "File-ok kititkosÃtása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ..." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "törölve" @@ -302,7 +330,7 @@ msgstr "Érvényes jelszót kell megadnia" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Figyelmeztetés: A felhasználó \"{user}\" kezdÅ‘ könyvtára már létezett" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -627,11 +655,11 @@ msgstr "Több" msgid "Less" msgstr "Kevesebb" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Verzió" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Ezt a cÃmet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "A titkosÃtó alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosÃtását a file-jaidnak." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Bejelentkezési jelszó" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "KititkosÃtja az összes file-t" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Bejelentkezési név" diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po index b80e564d9e5..9349848ce19 100644 --- a/l10n/hy/settings.po +++ b/l10n/hy/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po index b030c039fd5..c348558a387 100644 --- a/l10n/ia/settings.po +++ b/l10n/ia/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Linguage cambiate" @@ -225,34 +245,42 @@ msgstr "Actualisar" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Contrasigno multo debile" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Contrasigno debile" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Contrasigno passabile" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Contrasigno bon" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Contrasigno forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Interlingua" @@ -623,11 +651,11 @@ msgstr "Plus" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index e5ee3ea2dd6..9907425200a 100644 --- a/l10n/id/settings.po +++ b/l10n/id/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Enkripsi" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email disimpan" @@ -114,6 +124,16 @@ msgstr "Tidak dapat menghapus grup" msgid "Unable to delete user" msgstr "Tidak dapat menghapus pengguna" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Bahasa telah diubah" @@ -225,34 +245,42 @@ msgstr "Perbarui" msgid "Updated" msgstr "Diperbarui" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Pilih foto profil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Sandi sangat lemah" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Sandi lemah" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Sandi lumayan" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Sandi baik" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Sandi kuat" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "dihapus" @@ -298,7 +326,7 @@ msgstr "Tuliskan sandi yang valid" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Peringatan: Direktori home untuk pengguna \"{user}\" sudah ada" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "Lainnya" msgid "Less" msgstr "Ciutkan" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versi" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Sandi masuk" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Deskripsi semua Berkas" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nama Masuk" diff --git a/l10n/is/settings.po b/l10n/is/settings.po index 40f5efecb36..7a6d59fb95c 100644 --- a/l10n/is/settings.po +++ b/l10n/is/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Dulkóðun" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Netfang vistað" @@ -115,6 +125,16 @@ msgstr "Ekki tókst að eyða hóp" msgid "Unable to delete user" msgstr "Ekki tókst að eyða notenda" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Tungumáli breytt" @@ -226,34 +246,42 @@ msgstr "Uppfæra" msgid "Updated" msgstr "Uppfært" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eytt" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__nafn_tungumáls__" @@ -624,11 +652,11 @@ msgstr "Meira" msgid "Less" msgstr "Minna" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Útgáfa" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index c19f062654a..a75f1045cc3 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio msgid "Send mode" msgstr "Modalità di invio" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Cifratura" @@ -102,6 +102,16 @@ msgstr "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chie msgid "Couldn't decrypt your files, check your password and try again" msgstr "Impossibile decifrare i tuoi file, controlla la password e prova ancora" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email salvata" @@ -118,6 +128,16 @@ msgstr "Impossibile eliminare il gruppo" msgid "Unable to delete user" msgstr "Impossibile eliminare l'utente" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Lingua modificata" @@ -229,34 +249,42 @@ msgstr "Aggiorna" msgid "Updated" msgstr "Aggiornato" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleziona un'immagine del profilo" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Password molto debole" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Password debole" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Password così-così" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Password buona" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Password forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "eliminati" @@ -302,7 +330,7 @@ msgstr "Deve essere fornita una password valida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Avviso: la cartella home dell'utente \"{user}\" esiste già " -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Italiano" @@ -627,11 +655,11 @@ msgstr "Altro" msgid "Less" msgstr "Meno" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versione" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Password di accesso" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decifra tutti i file" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome utente" diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po index 8089a0f6ece..91700405a8e 100644 --- a/l10n/ja/settings.po +++ b/l10n/ja/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: mikako\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,7 @@ msgstr "ユーザーメールをè¨å®šã—ã¦åˆã‚ã¦ã€ãƒ†ã‚¹ãƒˆãƒ¡ãƒ¼ãƒ«ã‚’é€ msgid "Send mode" msgstr "é€ä¿¡ãƒ¢ãƒ¼ãƒ‰" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "æš—å·åŒ–" @@ -104,6 +104,16 @@ msgstr "ファイルを復å·åŒ–ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ownclo msgid "Couldn't decrypt your files, check your password and try again" msgstr "ファイルを復å·åŒ–ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚パスワードを確èªã®ã†ãˆå†è©¦è¡Œã—ã¦ãã ã•ã„。" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "メールアドレスをä¿å˜ã—ã¾ã—ãŸ" @@ -120,6 +130,16 @@ msgstr "グループを削除ã§ãã¾ã›ã‚“" msgid "Unable to delete user" msgstr "ユーザーを削除ã§ãã¾ã›ã‚“" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "言語ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ" @@ -231,34 +251,42 @@ msgstr "アップデート" msgid "Updated" msgstr "アップデート済ã¿" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ç”»åƒã‚’é¸æŠž" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "éžå¸¸ã«å¼±ã„パスワード" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "å¼±ã„パスワード" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "ã¾ãšã¾ãšã®ãƒ‘スワード" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "良好ãªãƒ‘スワード" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "å¼·ã„パスワード" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "ファイルを複åˆä¸... ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€ã“ã®å‡¦ç†ã«ã¯å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "削除" @@ -304,7 +332,7 @@ msgstr "有効ãªãƒ‘スワードを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "è¦å‘Š: ユーザー \"{user}\" ã®ãƒ›ãƒ¼ãƒ ディレクトリã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Japanese (日本語)" @@ -629,11 +657,11 @@ msgstr "ã‚‚ã£ã¨è¦‹ã‚‹" msgid "Less" msgstr "é–‰ã˜ã‚‹" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -797,18 +825,33 @@ msgid "" "WebDAV</a>" msgstr "<a href=\"%s\" target=\"_blank\">WebDAV 経由ã§ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹</a> ã™ã‚‹ã«ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¦ãã ã•ã„" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "æš—å·åŒ–アプリã¯ã‚‚ã¯ã‚„有効ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複åˆã—ã¦ãã ã•ã„" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "ãƒã‚°ã‚¤ãƒ³ãƒ‘スワード" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複åˆã™ã‚‹" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ãƒã‚°ã‚¤ãƒ³å" diff --git a/l10n/jv/settings.po b/l10n/jv/settings.po index b110d3bb887..5b267e2b34c 100644 --- a/l10n/jv/settings.po +++ b/l10n/jv/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index 71ab32583ad..4041ae62e9d 100644 --- a/l10n/ka_GE/settings.po +++ b/l10n/ka_GE/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ენკრიპციáƒ" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "იმეილი შენáƒáƒ®áƒ£áƒšáƒ˜áƒ" @@ -115,6 +125,16 @@ msgstr "ჯგუფის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ" msgid "Unable to delete user" msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "ენრშეცვლილიáƒ" @@ -226,34 +246,42 @@ msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბáƒ" msgid "Updated" msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბულიáƒ" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜" @@ -299,7 +327,7 @@ msgstr "უნდრმიუთითáƒáƒ— áƒáƒ სებული პáƒáƒ msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -624,11 +652,11 @@ msgstr "უფრრმეტი" msgid "Less" msgstr "უფრრნáƒáƒ™áƒšáƒ”ბი" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ვერსიáƒ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი" diff --git a/l10n/km/settings.po b/l10n/km/settings.po index 7ac02ecb074..ae5ebac02c7 100644 --- a/l10n/km/settings.po +++ b/l10n/km/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-12 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 14:00+0000\n" -"Last-Translator: សុវិចិážáŸ’ážš Sovichet áž‘áŸáž– Tep\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +53,7 @@ msgstr "អ្នក​ážáŸ’រូវ​ážáŸ‚​កំណážáŸ‹â€‹áž¢áŸŠáž¸áž˜ msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "កូដនីយកម្ម" @@ -100,6 +100,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "បាន​រក្សា​ទុក​អ៊ីមែល" @@ -116,6 +126,16 @@ msgstr "មិន​អាច​លុប​ក្រុម​បាន" msgid "Unable to delete user" msgstr "មិន​អាច​លុប​អ្នក​ប្រើ​បាន" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "បាន​ប្ដូរ​ភាសា" @@ -227,34 +247,42 @@ msgstr "ធ្វើ​បច្ចុប្បន្នភាព" msgid "Updated" msgstr "បាន​ធ្វើ​បច្ចុប្បន្នភាព" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "ជ្រើស​រូបភាព​ប្រវážáŸ’ážáž·ážšáž¼áž”" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ​ណាស់" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž’ម្មážáž¶" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž›áŸ’អ" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’លាំង" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "បាន​លុប" @@ -300,7 +328,7 @@ msgstr "ážáŸ’រូវ​ផ្ដល់​ពាក្យ​សម្ងាហmsgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -625,11 +653,11 @@ msgstr "ច្រើន​ទៀáž" msgid "Less" msgstr "ážáž·áž…" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "កំណែ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž…ូល​គណនី" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ចូល" diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po index b2914c0adc0..4d74debd3de 100644 --- a/l10n/kn/settings.po +++ b/l10n/kn/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index 2dbdf1c06dd..49cd5ae7c08 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "암호화" @@ -103,6 +103,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ì´ë©”ì¼ ì €ìž¥ë¨" @@ -119,6 +129,16 @@ msgstr "ê·¸ë£¹ì„ ì‚ì œí• ìˆ˜ ì—†ìŒ" msgid "Unable to delete user" msgstr "사용ìžë¥¼ ì‚ì œí• ìˆ˜ ì—†ìŒ." +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "언어가 변경ë¨" @@ -230,34 +250,42 @@ msgstr "ì—…ë°ì´íŠ¸" msgid "Updated" msgstr "ì—…ë°ì´íŠ¸ë¨" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "프로필 사진 ì„ íƒ" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "매우 약한 암호" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "약한 암호" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "ê·¸ì € 그런 암호" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "ì¢‹ì€ ì•”í˜¸" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "ê°•ë ¥í•œ 암호" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "íŒŒì¼ ë³µí˜¸í™” 중... ì‹œê°„ì´ ê±¸ë¦´ ìˆ˜ë„ ìžˆìœ¼ë‹ˆ ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ì‚ì œë¨" @@ -303,7 +331,7 @@ msgstr "올바른 암호를 ìž…ë ¥í•´ì•¼ 함" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "ê²½ê³ : ì‚¬ìš©ìž \"{user}\"ì˜ í™ˆ ë””ë ‰í„°ë¦¬ê°€ ì´ë¯¸ 존재합니다" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "í•œêµì–´" @@ -628,11 +656,11 @@ msgstr "ë” ì¤‘ìš”í•¨" msgid "Less" msgstr "ëœ ì¤‘ìš”í•¨" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ë²„ì „" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -796,18 +824,33 @@ msgid "" "WebDAV</a>" msgstr "WebDAVë¡œ 파ì¼ì— ì ‘ê·¼í•˜ë ¤ë©´ <a href=\"%s\" target=\"_blank\">ì´ ì£¼ì†Œë¥¼ 사용하ì‹ì‹œì˜¤</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "암호화 ì•±ì´ ë¹„í™œì„±í™”ë˜ì—ˆìŠµë‹ˆë‹¤. ëª¨ë“ íŒŒì¼ì„ 복호화해야 합니다." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "ë¡œê·¸ì¸ ì•”í˜¸" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "ëª¨ë“ íŒŒì¼ ë³µí˜¸í™”" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ë¡œê·¸ì¸ ì´ë¦„" diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index 524d5125183..7b95bc53250 100644 --- a/l10n/ku_IQ/settings.po +++ b/l10n/ku_IQ/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "نهێنیکردن" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "نوێکردنه‌وه" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "چوونەژوورەوە" diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po index 4c34b60560a..0a5221ae1e4 100644 --- a/l10n/lb/settings.po +++ b/l10n/lb/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail gespäichert" @@ -115,6 +125,16 @@ msgstr "Onmeiglech d'Grup ze läschen." msgid "Unable to delete user" msgstr "Onmeiglech User zu läschen." +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Sprooch huet geännert" @@ -226,34 +246,42 @@ msgstr "Update" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "geläscht" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -624,11 +652,11 @@ msgstr "Méi" msgid "Less" msgstr "Manner" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Login" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index 4661ad287c0..f6b1c5492d7 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifravimas" @@ -103,6 +103,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "El. paÅ¡tas iÅ¡saugotas" @@ -119,6 +129,16 @@ msgstr "Nepavyko iÅ¡trinti grupÄ—s" msgid "Unable to delete user" msgstr "Nepavyko iÅ¡trinti vartotojo" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Kalba pakeista" @@ -230,34 +250,42 @@ msgstr "Atnaujinti" msgid "Updated" msgstr "Atnaujinta" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "PažymÄ—kite profilio paveikslÄ—lį" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "IÅ¡Å¡ifruojami failai... PraÅ¡ome palaukti, tai gali užtrukti." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "iÅ¡trinta" @@ -303,7 +331,7 @@ msgstr "Slaptažodis turi bÅ«ti tinkamas" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Ä®spÄ—jimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Kalba" @@ -628,11 +656,11 @@ msgstr "Daugiau" msgid "Less" msgstr "Mažiau" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versija" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -796,18 +824,33 @@ msgid "" "WebDAV</a>" msgstr "Naudokite šį adresÄ…, kad <a href=\"%s\" target=\"_blank\">pasiektumÄ—te savo failus per WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Prisijungimo slaptažodis" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "IÅ¡Å¡ifruoti visus failus" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Vartotojo vardas" diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index 09a6e94049a..2d4e7f783cc 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifrÄ“Å¡ana" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-pasts tika saglabÄts" @@ -115,6 +125,16 @@ msgstr "Nevar izdzÄ“st grupu" msgid "Unable to delete user" msgstr "Nevar izdzÄ“st lietotÄju" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Valoda tika nomainÄ«ta" @@ -226,34 +246,42 @@ msgstr "AtjauninÄt" msgid "Updated" msgstr "AtjauninÄta" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "AtÅ¡ifrÄ“ju failus... Uzgaidiet tas var ilgt kÄdu laiku." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "izdzests" @@ -299,7 +327,7 @@ msgstr "JÄnorÄda derÄ«ga parole" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__valodas_nosaukums__" @@ -624,11 +652,11 @@ msgstr "VairÄk" msgid "Less" msgstr "MazÄk" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versija" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "PieslÄ“gÅ¡anÄs parole" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "AtÅ¡ifrÄ“t visus failus" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "IerakstÄ«Å¡anÄs vÄrds" diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index 0a62ca05fa3..b8ed6cc23ee 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Енкрипција" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ЕлектронÑката пошта е Ñнимена" @@ -115,6 +125,16 @@ msgstr "Ðеможе да избришам група" msgid "Unable to delete user" msgstr "Ðеможам да избришам кориÑник" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Јазикот е Ñменет" @@ -226,34 +246,42 @@ msgstr "Ðжурирај" msgid "Updated" msgstr "Ðадграден" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Одбери фотографија за профилот" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "избришан" @@ -299,7 +327,7 @@ msgstr "Мора да Ñе обезбеди валидна лозинка" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -624,11 +652,11 @@ msgstr "Повеќе" msgid "Less" msgstr "Помалку" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Верзија" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Лозинка за најавување" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Дешифрирај ги Ñите датотеки" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Име за најава" diff --git a/l10n/ml/settings.po b/l10n/ml/settings.po index 9c4432176ca..44fbe3297cb 100644 --- a/l10n/ml/settings.po +++ b/l10n/ml/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po index 0e584edd601..b58d48f248a 100644 --- a/l10n/ml_IN/settings.po +++ b/l10n/ml_IN/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/mn/settings.po b/l10n/mn/settings.po index 5b2d9dcaf46..42583be4d37 100644 --- a/l10n/mn/settings.po +++ b/l10n/mn/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po index e0991049d26..177b5c92c09 100644 --- a/l10n/ms_MY/settings.po +++ b/l10n/ms_MY/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Emel disimpan" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Bahasa diubah" @@ -225,34 +245,42 @@ msgstr "Kemaskini" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "dihapus" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "_nama_bahasa_" @@ -623,11 +651,11 @@ msgstr "Lanjutan" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Log masuk" diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po index 04052f98e79..0687b5c027b 100644 --- a/l10n/my_MM/settings.po +++ b/l10n/my_MM/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 600db12fae9..f237d066e17 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_NO/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Kryptering" @@ -102,6 +102,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Epost lagret" @@ -118,6 +128,16 @@ msgstr "Kan ikke slette gruppe" msgid "Unable to delete user" msgstr "Kan ikke slette bruker" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "SprÃ¥k endret" @@ -229,34 +249,42 @@ msgstr "Oppdater" msgid "Updated" msgstr "Oppdatert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Velg et profilbilde" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Veldig svakt passord" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Svakt passord" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Bra passord" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Sterkt passord" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterer filer... Vennligst vent, dette kan ta litt tid." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "slettet" @@ -302,7 +330,7 @@ msgstr "Oppgi et gyldig passord" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -627,11 +655,11 @@ msgstr "Mer" msgid "Less" msgstr "Mindre" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versjon" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Bruk denne adressen for Ã¥ <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Innloggingspassord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekrypter alle filer" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Logginn navn" diff --git a/l10n/nds/settings.po b/l10n/nds/settings.po index aca2bdf5836..10ee5ff5823 100644 --- a/l10n/nds/settings.po +++ b/l10n/nds/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po index c232c9c8c40..34e7295ff7a 100644 --- a/l10n/ne/settings.po +++ b/l10n/ne/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 789caeed83a..fa483d9f6bc 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: André Koot <meneer@tken.net>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "U moet uw e-mailadres instellen voordat u testberichten kunt versturen." msgid "Send mode" msgstr "Verstuurmodus" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Versleuteling" @@ -102,6 +102,16 @@ msgstr "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag msgid "Couldn't decrypt your files, check your password and try again" msgstr "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail bewaard" @@ -118,6 +128,16 @@ msgstr "Niet in staat om groep te verwijderen" msgid "Unable to delete user" msgstr "Niet in staat om gebruiker te verwijderen" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Taal aangepast" @@ -229,34 +249,42 @@ msgstr "Bijwerken" msgid "Updated" msgstr "Bijgewerkt" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Kies een profielafbeelding" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Zeer zwak wachtwoord" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Zwak wachtwoord" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Matig wachtwoord" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Goed wachtwoord" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Sterk wachtwoord" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "verwijderd" @@ -302,7 +330,7 @@ msgstr "Er moet een geldig wachtwoord worden opgegeven" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Nederlands" @@ -627,11 +655,11 @@ msgstr "Meer" msgid "Less" msgstr "Minder" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versie" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Inlog-wachtwoord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decodeer alle bestanden" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Inlognaam" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index e5b88cd42f6..730f8b73e35 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Kryptering" @@ -101,6 +101,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-postadresse lagra" @@ -117,6 +127,16 @@ msgstr "Klarte ikkje Ã¥ sletta gruppa" msgid "Unable to delete user" msgstr "Klarte ikkje sletta brukaren" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "SprÃ¥k endra" @@ -228,34 +248,42 @@ msgstr "Oppdater" msgid "Updated" msgstr "Oppdatert" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Vel eit profilbilete" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "sletta" @@ -301,7 +329,7 @@ msgstr "Du mÃ¥ oppgje eit gyldig passord" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Nynorsk" @@ -626,11 +654,11 @@ msgstr "Meir" msgid "Less" msgstr "Mindre" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "UtgÃ¥ve" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Innloggingspassord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekrypter alle filene" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Innloggingsnamn" diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po index 57d51e38919..de9c8620490 100644 --- a/l10n/nqo/settings.po +++ b/l10n/nqo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po index 9284956c2f3..7d6fc040cc2 100644 --- a/l10n/oc/settings.po +++ b/l10n/oc/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Corrièl enregistrat" @@ -114,6 +124,16 @@ msgstr "Pas capable d'escafar un grop" msgid "Unable to delete user" msgstr "Pas capable d'escafar un usancièr" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Lengas cambiadas" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "escafat" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "Mai d'aquò" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Login" diff --git a/l10n/or_IN/settings.po b/l10n/or_IN/settings.po index e3510389e2d..4daa5cf3696 100644 --- a/l10n/or_IN/settings.po +++ b/l10n/or_IN/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po index 2fbce46e37f..80103573854 100644 --- a/l10n/pa/settings.po +++ b/l10n/pa/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -115,6 +125,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "à¨à¨¾à¨¶à¨¾ ਬਦਲੀ" @@ -226,34 +246,42 @@ msgstr "" msgid "Updated" msgstr "ਅੱਪਡੇਟ ਕੀਤਾ" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ਹਟਾਈ" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__à¨à¨¾à¨¶à¨¾_ਨਾਂ__" @@ -624,11 +652,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ਲਾਗਇਨ" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index 083b9d51e67..1a022185f4f 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: bobie <maciej.przybecki@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +54,7 @@ msgstr "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyÅ‚ać wiadomo msgid "Send mode" msgstr "Tryb wysyÅ‚ki" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Szyfrowanie" @@ -101,6 +101,16 @@ msgstr "Nie można zdeszyfrować Twoich plików, proszÄ™ sprawdzić owncloud.log msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasÅ‚o i spróbuj ponownie" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail zapisany" @@ -117,6 +127,16 @@ msgstr "Nie można usunąć grupy" msgid "Unable to delete user" msgstr "Nie można usunąć użytkownika" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Zmieniono jÄ™zyk" @@ -228,34 +248,42 @@ msgstr "Aktualizuj" msgid "Updated" msgstr "Zaktualizowano" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Wybierz zdjÄ™cie profilu" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Bardzo sÅ‚abe hasÅ‚o" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "SÅ‚abe hasÅ‚o" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "MaÅ‚o skomplikowane hasÅ‚o" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Dobre hasÅ‚o" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Mocne hasÅ‚o" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Odszyfrowuje pliki... ProszÄ™ czekać, to może zająć jakiÅ› czas." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "usuniÄ™to" @@ -301,7 +329,7 @@ msgstr "Należy podać prawidÅ‚owe hasÅ‚o" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "polski" @@ -626,11 +654,11 @@ msgstr "WiÄ™cej" msgid "Less" msgstr "Mniej" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Wersja" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostÄ™pu do twoich plików przez WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Aplikacja szyfrowanie nie jest wÅ‚Ä…czona, odszyfruj wszystkie plik" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "HasÅ‚o logowania" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Odszyfruj wszystkie pliki" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Login" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index a24e3d6fc77..8e84befbc0a 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Flávio Veras <flaviove@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +54,7 @@ msgstr "Você precisa configurar seu e-mail de usuário antes de ser capaz de en msgid "Send mode" msgstr "Modo enviar" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Criptografia" @@ -101,6 +101,16 @@ msgstr "Não foi possÃvel descriptografar os arquivos, verifique a sua owncloud msgid "Couldn't decrypt your files, check your password and try again" msgstr "Não foi possÃvel descriptografar os arquivos, verifique sua senha e tente novamente" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail salvo" @@ -117,6 +127,16 @@ msgstr "Não foi possÃvel remover grupo" msgid "Unable to delete user" msgstr "Não foi possÃvel remover usuário" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma alterado" @@ -228,34 +248,42 @@ msgstr "Atualizar" msgid "Updated" msgstr "Atualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Selecione uma imagem para o perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Senha muito fraca" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Senha fraca" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "So-so senha" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Boa senha" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Senha forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "excluÃdo" @@ -301,7 +329,7 @@ msgstr "Forneça uma senha válida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Aviso: O diretório home para o usuário \"{user}\" já existe" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Português (Brasil)" @@ -626,11 +654,11 @@ msgstr "Mais" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versão" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Senha de login" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decripti todos os Arquivos" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome de Login" diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index f6f1ff539c9..59028dc8e56 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/lib.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-12 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 12:00+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 20:37+0000\n" "Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: base.php:713 +#: base.php:685 msgid "You are accessing the server from an untrusted domain." msgstr "" -#: base.php:714 +#: base.php:686 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " @@ -293,8 +293,8 @@ msgstr "O seu servidor web não está configurado correctamente para autorizar s msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Por favor verifique <a href='%s'>installation guides</a>." -#: private/share/mailnotifications.php:72 -#: private/share/mailnotifications.php:118 +#: private/share/mailnotifications.php:91 +#: private/share/mailnotifications.php:137 #, php-format msgid "%s shared »%s« with you" msgstr "%s partilhado »%s« consigo" @@ -307,7 +307,7 @@ msgstr "" #: private/share/share.php:523 #, php-format msgid "Sharing %s failed, because the user %s is the item owner" -msgstr "" +msgstr "A partilha %s falhou, porque o utilizador %s é o proprietário" #: private/share/share.php:529 #, php-format @@ -358,45 +358,45 @@ msgstr "" msgid "Setting permissions for %s failed, because the item was not found" msgstr "" -#: private/share/share.php:941 +#: private/share/share.php:942 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: private/share/share.php:948 +#: private/share/share.php:949 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: private/share/share.php:954 +#: private/share/share.php:955 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1368 +#: private/share/share.php:1370 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1377 +#: private/share/share.php:1379 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1392 +#: private/share/share.php:1394 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1404 +#: private/share/share.php:1406 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1418 +#: private/share/share.php:1420 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index 61f25765d60..47dc787e8a3 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,7 @@ msgstr "" msgid "Send mode" msgstr "Modo de envio" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Encriptação" @@ -105,6 +105,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email guardado" @@ -121,6 +131,16 @@ msgstr "ImpossÃvel apagar grupo" msgid "Unable to delete user" msgstr "ImpossÃvel apagar utilizador" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Idioma alterado" @@ -232,34 +252,42 @@ msgstr "Actualizar" msgid "Updated" msgstr "Actualizado" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Seleccione uma fotografia de perfil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Password muito fraca" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Password fraca" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Password aceitável" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Password Forte" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Password muito forte" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "apagado" @@ -305,7 +333,7 @@ msgstr "Uma password válida deve ser fornecida" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Atenção: a pasta pessoal do utilizador \"{user}\" já existe" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -630,11 +658,11 @@ msgstr "Mais" msgid "Less" msgstr "Menos" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versão" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -798,18 +826,33 @@ msgid "" "WebDAV</a>" msgstr "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Password de entrada" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Desencriptar todos os ficheiros" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Nome de utilizador" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index 6070aad2b2e..25306576a42 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-13 20:38+0000\n" "Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -130,25 +130,25 @@ msgstr "Deseja realmente apagar as configurações de servidor actuais?" msgid "Confirm Deletion" msgstr "Confirmar a operação de apagar" -#: lib/wizard.php:79 lib/wizard.php:93 +#: lib/wizard.php:83 lib/wizard.php:97 #, php-format msgid "%s group found" msgid_plural "%s groups found" msgstr[0] "%s grupo encontrado" msgstr[1] "%s grupos encontrados" -#: lib/wizard.php:122 +#: lib/wizard.php:130 #, php-format msgid "%s user found" msgid_plural "%s users found" msgstr[0] "%s utilizador encontrado" msgstr[1] "%s utilizadores encontrados" -#: lib/wizard.php:784 lib/wizard.php:796 +#: lib/wizard.php:825 lib/wizard.php:837 msgid "Invalid Host" msgstr "Hospedeiro Inválido" -#: lib/wizard.php:984 +#: lib/wizard.php:1025 msgid "Could not find the desired feature" msgstr "Não se encontrou a função desejada" @@ -501,7 +501,7 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behavior. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "Por defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados)." #: templates/settings.php:58 msgid "UUID Attribute for Users:" @@ -527,7 +527,7 @@ msgid "" " is not configuration sensitive, it affects all LDAP configurations! Never " "clear the mappings in a production environment, only in a testing or " "experimental stage." -msgstr "" +msgstr "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestÃgios em todo o lado. A limpeza dos mapeamentos não é sensÃvel à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental." #: templates/settings.php:62 msgid "Clear Username-LDAP User Mapping" diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 216e019e381..d5209cd8530 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" msgid "Send mode" msgstr "Modul de expediere" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ÃŽncriptare" @@ -101,6 +101,16 @@ msgstr "Nu s-a puput decripta fiÈ™ierele tale, verifică owncloud.log sau între msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nu s-a puput decripta fiÈ™ierele tale, verifică parola È™i încearcă din nou" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-mail salvat" @@ -117,6 +127,16 @@ msgstr "Nu s-a putut È™terge grupul" msgid "Unable to delete user" msgstr "Nu s-a putut È™terge utilizatorul" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Limba a fost schimbată" @@ -228,34 +248,42 @@ msgstr "Actualizare" msgid "Updated" msgstr "Actualizat" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Selectează o imagine de profil" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Parolă foarte slabă" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Parolă slabă" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Decriptare fiÈ™iere... Te rog aÈ™teaptă, poate dura ceva timp." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "È™ters" @@ -301,7 +329,7 @@ msgstr "Trebuie să furnizaÅ£i o parolă validă" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "_language_name_" @@ -626,11 +654,11 @@ msgstr "Mai mult" msgid "Less" msgstr "Mai puÈ›in" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versiunea" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -794,18 +822,33 @@ msgid "" "WebDAV</a>" msgstr "FoloseÈ™te această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fiÈ™ierele tale folosind WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Parolă" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Decriptează toate fiÈ™ierele" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Autentificare" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index 46e2ce68301..0e3c4757a3d 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-13 01:55-0400\n" -"PO-Revision-Date: 2014-05-13 04:27+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 04:20+0000\n" "Last-Translator: tukos <kalyuzhniy@gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -246,7 +246,7 @@ msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\"" #: private/setup/mysql.php:85 #, php-format msgid "MySQL/MariaDB user '%s'@'localhost' exists already." -msgstr "" +msgstr "Пользователь MySQL '%s'@'localhost' уже ÑущеÑтвует." #: private/setup/mysql.php:86 msgid "Drop this user from MySQL/MariaDB" @@ -255,7 +255,7 @@ msgstr "Удалить данного учаÑтника из MySQL/MariaDB" #: private/setup/mysql.php:91 #, php-format msgid "MySQL/MariaDB user '%s'@'%%' already exists" -msgstr "" +msgstr "Пользователь MySQL '%s'@'%%' уже ÑущеÑтвует." #: private/setup/mysql.php:92 msgid "Drop this user from MySQL/MariaDB." @@ -297,8 +297,8 @@ msgstr "Ваш веб Ñервер до Ñих пор не наÑтроен пр msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "ПожалуйÑта, дважды проÑмотрите <a href='%s'>инÑтрукции по уÑтановке</a>." -#: private/share/mailnotifications.php:72 -#: private/share/mailnotifications.php:118 +#: private/share/mailnotifications.php:91 +#: private/share/mailnotifications.php:137 #, php-format msgid "%s shared »%s« with you" msgstr "%s поделилÑÑ Â»%s« Ñ Ð²Ð°Ð¼Ð¸" @@ -311,12 +311,12 @@ msgstr "" #: private/share/share.php:523 #, php-format msgid "Sharing %s failed, because the user %s is the item owner" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s уже ÑвлÑетÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼" #: private/share/share.php:529 #, php-format msgid "Sharing %s failed, because the user %s does not exist" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s не ÑущеÑтвует." #: private/share/share.php:538 #, php-format @@ -328,79 +328,79 @@ msgstr "" #: private/share/share.php:551 private/share/share.php:579 #, php-format msgid "Sharing %s failed, because this item is already shared with %s" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s ,в виду того что, объект уже находитьÑÑ Ð² общем доÑтупе Ñ %s" #: private/share/share.php:559 #, php-format msgid "Sharing %s failed, because the group %s does not exist" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, группа %s не ÑущеÑтвует." #: private/share/share.php:566 #, php-format msgid "Sharing %s failed, because %s is not a member of the group %s" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, %s не ÑвлÑетÑÑ Ñ‡Ð»ÐµÐ½Ð¾Ð¼ группы %s" #: private/share/share.php:629 #, php-format msgid "Sharing %s failed, because sharing with links is not allowed" -msgstr "" +msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, потому что обмен Ñо ÑÑылками не допуÑкаетÑÑ" #: private/share/share.php:636 #, php-format msgid "Share type %s is not valid for %s" -msgstr "" +msgstr "Такой втд общего доÑтупа как %s не допуÑтим Ð´Ð»Ñ %s" #: private/share/share.php:774 #, php-format msgid "" "Setting permissions for %s failed, because the permissions exceed " "permissions granted to %s" -msgstr "" +msgstr "ÐаÑтройка прав доÑтупа Ð´Ð»Ñ %s невозможна, поÑкольку права доÑтупа превышают предоÑтавленные права доÑтупа %s" #: private/share/share.php:835 #, php-format msgid "Setting permissions for %s failed, because the item was not found" -msgstr "" +msgstr "Ðе удалоÑÑŒ произвеÑти наÑтройку прав доÑтупа Ð´Ð»Ñ %s , Ñлемент не был найден." -#: private/share/share.php:941 +#: private/share/share.php:942 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: private/share/share.php:948 +#: private/share/share.php:949 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: private/share/share.php:954 +#: private/share/share.php:955 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1368 +#: private/share/share.php:1370 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1377 +#: private/share/share.php:1379 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1392 +#: private/share/share.php:1394 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1404 +#: private/share/share.php:1406 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1418 +#: private/share/share.php:1420 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" @@ -467,7 +467,7 @@ msgstr "неÑколько лет назад" msgid "" "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", " "\"0-9\", and \"_.@-\"" -msgstr "" +msgstr "Только Ñледующие Ñимволы допуÑкаютÑÑ Ð² имени пользователÑ: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"" #: private/user/manager.php:237 msgid "A valid username must be provided" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index 3b5f336afc3..340f4912913 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Denis Plastinin <denispal@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +68,7 @@ msgstr "Ð’Ñ‹ должны наÑтроить Ñвой e-mail пользоватРmsgid "Send mode" msgstr "Отправить Ñообщение" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Шифрование" @@ -115,6 +115,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email Ñохранен" @@ -131,6 +141,16 @@ msgstr "Ðевозможно удалить группу" msgid "Unable to delete user" msgstr "Ðевозможно удалить пользователÑ" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Язык изменён" @@ -242,34 +262,42 @@ msgstr "Обновить" msgid "Updated" msgstr "Обновлено" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Выберите картинку профилÑ" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Очень Ñлабый пароль" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Слабый пароль" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Так Ñебе пароль" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Хороший пароль" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "УÑтойчивый к взлому пароль" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "РаÑшифровка файлов... ПожалуйÑта, подождите, Ñто может занÑÑ‚ÑŒ некоторое времÑ." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "удален" @@ -315,7 +343,7 @@ msgstr "Укажите валидный пароль" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Предупреждение: домашнÑÑ Ð¿Ð°Ð¿ÐºÐ° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ \"{user}\" уже ÑущеÑтвует" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "РуÑÑкий " @@ -640,11 +668,11 @@ msgstr "Больше" msgid "Less" msgstr "Меньше" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ВерÑиÑ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -808,18 +836,33 @@ msgid "" "WebDAV</a>" msgstr "ИÑпользуйте Ñтот адреÑÑ Ð´Ð»Ñ <a href=\"%s\" target=\"_blank\">доÑтупа к вашим файлам через WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Приложение Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾, пожалуйÑта, раÑшифруйте ваши файлы" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Пароль входа" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "СнÑÑ‚ÑŒ шифрование Ñо вÑех файлов" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index 0e09cbdcd73..e985bc24165 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ගුප්චකේà¶à¶±à¶º" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "වි-à¶à·à¶´à·‘ල සුරකින ලදී" @@ -114,6 +124,16 @@ msgstr "කණ්ඩà·à¶ºà¶¸ මà·à¶šà·“මට නොහà·à¶š" msgid "Unable to delete user" msgstr "පරිà·à·“ලකය෠මà·à¶šà·“මට නොහà·à¶š" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "භà·à·‚à·à·€ à·à·€à¶±à·ƒà·Š කිරීම" @@ -225,34 +245,42 @@ msgstr "යà·à·€à¶à·Šà¶šà·à¶½ කිරීම" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "à·€à·à¶©à·’" msgid "Less" msgstr "අඩු" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ප්â€à¶»à·€à·’à·à·Šà¶§à¶º" diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po index b9f2f2eb06c..69c7a59282c 100644 --- a/l10n/sk/settings.po +++ b/l10n/sk/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index e0cd21620c4..aa8af7fe801 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "MusÃte nastaviÅ¥ svoj po​​užÃvateľský email, než budete môcÅ¥ msgid "Send mode" msgstr "Mód odosielania" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifrovanie" @@ -100,6 +100,16 @@ msgstr "Nemožno deÅ¡ifrovaÅ¥ vaÅ¡e súbory, skontrolujte svoj owncloud.log aleb msgid "Couldn't decrypt your files, check your password and try again" msgstr "Nemožno deÅ¡ifrovaÅ¥ vaÅ¡e súbory, skontrolujte svoje heslo a skúste to znova" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email uložený" @@ -116,6 +126,16 @@ msgstr "Nie je možné odstrániÅ¥ skupinu" msgid "Unable to delete user" msgstr "Nie je možné odstrániÅ¥ použÃvateľa" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jazyk zmenený" @@ -227,34 +247,42 @@ msgstr "AktualizovaÅ¥" msgid "Updated" msgstr "Aktualizované" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "VybraÅ¥ avatara" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Veľmi slabé heslo" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Slabé heslo" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Priemerné heslo" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Dobré heslo" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Silné heslo" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "DeÅ¡ifrujem súbory ... PoÄkajte prosÃm, môže to chvÃľu trvaÅ¥." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "zmazané" @@ -300,7 +328,7 @@ msgstr "MusÃte zadaÅ¥ platné heslo" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Upozornenie: Domovský prieÄinok použÃvateľa \"{user}\" už existuje" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Slovensky" @@ -625,11 +653,11 @@ msgstr "Viac" msgid "Less" msgstr "Menej" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Verzia" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prÃstup k vaÅ¡im súborom cez WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Å ifrovacia aplikácia už nie je spustená, deÅ¡ifrujte vÅ¡etky svoje súbory." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Prihlasovacie heslo" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "DeÅ¡ifrovaÅ¥ vÅ¡etky súbory" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Prihlasovacie meno" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index abe97e3492a..11b2961b24b 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "" msgid "Send mode" msgstr "NaÄin poÅ¡iljanja" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Å ifriranje" @@ -100,6 +100,16 @@ msgstr "Datotek ni mogoÄe odÅ¡ifrirati. Preverite dnevnik owncloud.log ali pa s msgid "Couldn't decrypt your files, check your password and try again" msgstr "Datotek ni mogoÄe odÅ¡ifrirati. Preverite geslo in poskusite znova." +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Elektronski naslov je shranjen" @@ -116,6 +126,16 @@ msgstr "Skupine ni mogoÄe izbrisati" msgid "Unable to delete user" msgstr "Uporabnika ni mogoÄe izbrisati" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jezik je spremenjen" @@ -227,34 +247,42 @@ msgstr "Posodobi" msgid "Updated" msgstr "Posodobljeno" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Izbor slike profila" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Zelo Å¡ibko geslo" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Å ibko geslo" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Slabo geslo" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Dobro geslo" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "OdliÄno geslo" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Poteka odÅ¡ifriranje datotek ... Opravilo je lahko dolgotrajno." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "izbrisano" @@ -300,7 +328,7 @@ msgstr "Navedeno mora biti veljavno geslo" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "SlovenÅ¡Äina" @@ -625,11 +653,11 @@ msgstr "VeÄ" msgid "Less" msgstr "Manj" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "RazliÄica" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>." -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Program za Å¡ifriranje ni veÄ omogoÄen. OdÅ¡ifrirati je treba vse datoteke." -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Prijavno geslo" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "OdÅ¡ifriraj vse datoteke" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Prijavno ime" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 88410ed33f7..483e403c42c 100644 --- a/l10n/sq/settings.po +++ b/l10n/sq/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email u ruajt" @@ -114,6 +124,16 @@ msgstr "E pamundur të fshihet grupi" msgid "Unable to delete user" msgstr "E pamundur të fshihet përdoruesi" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Gjuha u ndryshua" @@ -225,34 +245,42 @@ msgstr "Përditësim" msgid "Updated" msgstr "I përditësuar" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "fshirë" @@ -298,7 +326,7 @@ msgstr "Duhet të jepni një fjalëkalim te vlefshëm" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Shqip" @@ -623,11 +651,11 @@ msgstr "Më tepër" msgid "Less" msgstr "M'pak" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Versioni" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Emri i Përdoruesit" diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index 3eda971e037..d5ebcbcd963 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Шифровање" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Е-порука Ñачувана" @@ -114,6 +124,16 @@ msgstr "Ðе могу да уклоним групу" msgid "Unable to delete user" msgstr "Ðе могу да уклоним кориÑника" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Језик је промењен" @@ -225,34 +245,42 @@ msgstr "Ðжурирај" msgid "Updated" msgstr "Ðжурирано" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "обриÑано" @@ -298,7 +326,7 @@ msgstr "Морате унети иÑправну лозинку" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -623,11 +651,11 @@ msgstr "Више" msgid "Less" msgstr "Мање" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Верзија" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "КориÑничко име" diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po index f50402c96dc..4304815e19e 100644 --- a/l10n/sr@latin/settings.po +++ b/l10n/sr@latin/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Jezik je izmenjen" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/su/settings.po b/l10n/su/settings.po index b33b3f24895..e076843db1d 100644 --- a/l10n/su/settings.po +++ b/l10n/su/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index ad8207f2c1b..a139b7007df 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -64,7 +64,7 @@ msgstr "Du behöver ställa in din användares e-postadress före du kan skicka msgid "Send mode" msgstr "Sändningsläge" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Kryptering" @@ -111,6 +111,16 @@ msgstr "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log el msgid "Couldn't decrypt your files, check your password and try again" msgstr "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-post sparad" @@ -127,6 +137,16 @@ msgstr "Kan inte radera grupp" msgid "Unable to delete user" msgstr "Kan inte radera användare" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "SprÃ¥k ändrades" @@ -238,34 +258,42 @@ msgstr "Uppdatera" msgid "Updated" msgstr "Uppdaterad" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Välj en profilbild" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Väldigt svagt lösenord" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Svagt lösenord" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Okej lösenord" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Bra lösenord" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Starkt lösenord" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "raderad" @@ -311,7 +339,7 @@ msgstr "Ett giltigt lösenord mÃ¥ste anges" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Varning: Hem katalogen för varje användare \"{användare}\" finns redan" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -636,11 +664,11 @@ msgstr "Mer" msgid "Less" msgstr "Mindre" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Version" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -804,18 +832,33 @@ msgid "" "WebDAV</a>" msgstr "Använd denna adress till <a href=\"%s\" target=\"_blank\">nÃ¥ dina Filer via WebDAV</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Inloggningslösenord" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Dekryptera alla filer" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Inloggningsnamn" diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po index 9ab7ca5f0ad..178d0a25d36 100644 --- a/l10n/sw_KE/settings.po +++ b/l10n/sw_KE/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ta_IN/settings.po b/l10n/ta_IN/settings.po index 2bfa5979306..f6bfb6d656e 100644 --- a/l10n/ta_IN/settings.po +++ b/l10n/ta_IN/settings.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-01 01:55-0400\n" -"PO-Revision-Date: 2013-04-26 08:00+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po index 94b0c30d1f0..8a59e664b22 100644 --- a/l10n/ta_LK/settings.po +++ b/l10n/ta_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "மறைகà¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "மினà¯à®©à®žà¯à®šà®²à¯ சேமிகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" @@ -114,6 +124,16 @@ msgstr "கà¯à®´à¯à®µà¯ˆ நீகà¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯" msgid "Unable to delete user" msgstr "பயனாளரை நீகà¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "மொழி மாறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" @@ -225,34 +245,42 @@ msgstr "இறà¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "_மொழி_பெயரà¯_" @@ -623,11 +651,11 @@ msgstr "மேலதிக" msgid "Less" msgstr "கà¯à®±à¯ˆà®µà®¾à®©" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "பà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ" diff --git a/l10n/te/settings.po b/l10n/te/settings.po index 36208da4bad..95f442bdbcd 100644 --- a/l10n/te/settings.po +++ b/l10n/te/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "మరినà±à°¨à°¿" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 276b84a0bc2..f7851091949 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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" @@ -191,75 +191,75 @@ msgstr "" msgid "years ago" msgstr "" -#: js/oc-dialogs.js:125 -msgid "Choose" +#: js/oc-dialogs.js:95 js/oc-dialogs.js:236 +msgid "Yes" msgstr "" -#: js/oc-dialogs.js:151 -msgid "Error loading file picker template: {error}" +#: js/oc-dialogs.js:105 js/oc-dialogs.js:246 +msgid "No" msgstr "" -#: js/oc-dialogs.js:177 -msgid "Yes" +#: js/oc-dialogs.js:184 +msgid "Choose" msgstr "" -#: js/oc-dialogs.js:187 -msgid "No" +#: js/oc-dialogs.js:210 +msgid "Error loading file picker template: {error}" msgstr "" -#: js/oc-dialogs.js:204 +#: js/oc-dialogs.js:263 msgid "Ok" msgstr "" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:283 msgid "Error loading message template: {error}" msgstr "" -#: js/oc-dialogs.js:352 +#: js/oc-dialogs.js:411 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "" msgstr[1] "" -#: js/oc-dialogs.js:366 +#: js/oc-dialogs.js:425 msgid "One file conflict" msgstr "" -#: js/oc-dialogs.js:372 +#: js/oc-dialogs.js:431 msgid "New Files" msgstr "" -#: js/oc-dialogs.js:373 +#: js/oc-dialogs.js:432 msgid "Already existing files" msgstr "" -#: js/oc-dialogs.js:375 +#: js/oc-dialogs.js:434 msgid "Which files do you want to keep?" msgstr "" -#: js/oc-dialogs.js:376 +#: js/oc-dialogs.js:435 msgid "" "If you select both versions, the copied file will have a number added to its " "name." msgstr "" -#: js/oc-dialogs.js:384 +#: js/oc-dialogs.js:443 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:394 +#: js/oc-dialogs.js:453 msgid "Continue" msgstr "" -#: js/oc-dialogs.js:441 js/oc-dialogs.js:454 +#: js/oc-dialogs.js:500 js/oc-dialogs.js:513 msgid "(all selected)" msgstr "" -#: js/oc-dialogs.js:444 js/oc-dialogs.js:458 +#: js/oc-dialogs.js:503 js/oc-dialogs.js:517 msgid "({count} selected)" msgstr "" -#: js/oc-dialogs.js:466 +#: js/oc-dialogs.js:525 msgid "Error loading file exists template" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 9eb0f73a11c..1932b17d7fa 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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_encryption.pot b/l10n/templates/files_encryption.pot index 111643588eb..2866e6567d8 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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 c37bf8a968d..8b2dd31dc57 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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" @@ -197,29 +197,29 @@ msgstr "" msgid "Saved" msgstr "" -#: lib/config.php:597 +#: lib/config.php:589 msgid "<b>Note:</b> " msgstr "" -#: lib/config.php:607 +#: lib/config.php:599 msgid " and " msgstr "" -#: lib/config.php:629 +#: lib/config.php:621 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:631 +#: lib/config.php:623 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of " "%s is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:633 +#: lib/config.php:625 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please " diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 7013b31420c..e0cf9c3d7f6 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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 c2f44734caa..bad146a524f 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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 0c0b3d733a8..5b5130a4247 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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 f8dc6c225bc..b099836864c 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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" @@ -290,8 +290,8 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: private/share/mailnotifications.php:72 -#: private/share/mailnotifications.php:118 +#: private/share/mailnotifications.php:91 +#: private/share/mailnotifications.php:137 #, php-format msgid "%s shared »%s« with you" msgstr "" @@ -355,45 +355,45 @@ msgstr "" msgid "Setting permissions for %s failed, because the item was not found" msgstr "" -#: private/share/share.php:941 +#: private/share/share.php:942 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: private/share/share.php:948 +#: private/share/share.php:949 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: private/share/share.php:954 +#: private/share/share.php:955 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1368 +#: private/share/share.php:1370 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1377 +#: private/share/share.php:1379 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1392 +#: private/share/share.php:1394 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1404 +#: private/share/share.php:1406 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1418 +#: private/share/share.php:1420 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index e9b9932a806..bad5160c970 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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" @@ -272,7 +272,7 @@ msgstr "" msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" -#: share/mailnotifications.php:72 share/mailnotifications.php:118 +#: share/mailnotifications.php:91 share/mailnotifications.php:137 #, php-format msgid "%s shared »%s« with you" msgstr "" @@ -336,45 +336,45 @@ msgstr "" msgid "Setting permissions for %s failed, because the item was not found" msgstr "" -#: share/share.php:941 +#: share/share.php:942 #, php-format msgid "Sharing backend %s must implement the interface OCP\\Share_Backend" msgstr "" -#: share/share.php:948 +#: share/share.php:949 #, php-format msgid "Sharing backend %s not found" msgstr "" -#: share/share.php:954 +#: share/share.php:955 #, php-format msgid "Sharing backend for %s not found" msgstr "" -#: share/share.php:1368 +#: share/share.php:1370 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: share/share.php:1377 +#: share/share.php:1379 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: share/share.php:1392 +#: share/share.php:1394 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: share/share.php:1404 +#: share/share.php:1406 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: share/share.php:1418 +#: share/share.php:1420 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index f9691843d06..94de0818fa2 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your owncloud." +"log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask " +"your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -224,34 +244,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -297,7 +325,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -621,11 +649,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank" "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" " @@ -789,18 +817,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong " +"you can restore the keys. Only delete them permanently if you are sure that " +"all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index c14dc4cf248..040dfb2653a 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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 6bd299623e0..d85a5b5d2a8 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: 2014-05-13 01:55-0400\n" +"POT-Creation-Date: 2014-05-14 01:54-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/settings.po b/l10n/th_TH/settings.po index 5b0000301d9..da72e440926 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "à¸à¸²à¸£à¹€à¸‚้ารหัส" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "à¸à¸µà¹€à¸¡à¸¥à¸–ูà¸à¸šà¸±à¸™à¸—ึà¸à¹à¸¥à¹‰à¸§" @@ -114,6 +124,16 @@ msgstr "ไม่สามารถลบà¸à¸¥à¸¸à¹ˆà¸¡à¹„ด้" msgid "Unable to delete user" msgstr "ไม่สามารถลบผู้ใช้งานได้" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "เปลี่ยนภาษาเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§" @@ -225,34 +245,42 @@ msgstr "à¸à¸±à¸žà¹€à¸”ท" msgid "Updated" msgstr "à¸à¸±à¸žà¹€à¸”ทà¹à¸¥à¹‰à¸§" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ลบà¹à¸¥à¹‰à¸§" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "ภาษาไทย" @@ -623,11 +651,11 @@ msgstr "มาà¸" msgid "Less" msgstr "น้à¸à¸¢" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "รุ่น" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "ชื่à¸à¸—ี่ใช้สำหรับเข้าสู่ระบบ" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index 41e2e658544..2cbcdca3f30 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: volkangezer <volkangezer@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarla msgid "Send mode" msgstr "Gönderme kipi" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Åžifreleme" @@ -102,6 +102,16 @@ msgstr "Dosyalarınızın ÅŸifresi kaldırılamadı, lütfen owncloud.log dosyas msgid "Couldn't decrypt your files, check your password and try again" msgstr "Dosyalarınızın ÅŸifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin." +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "E-posta kaydedildi" @@ -118,6 +128,16 @@ msgstr "Grup silinemiyor" msgid "Unable to delete user" msgstr "Kullanıcı silinemiyor" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Dil deÄŸiÅŸtirildi" @@ -229,34 +249,42 @@ msgstr "Güncelleme" msgid "Updated" msgstr "Güncellendi" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "Bir profil fotoÄŸrafı seçin" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Çok güçsüz parola" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Güçsüz parola" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "Normal parola" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Ä°yi parola" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Güçlü parola" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "Dosyaların ÅŸifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir." +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "silinen:" @@ -302,7 +330,7 @@ msgstr "Geçerli bir parola mutlaka saÄŸlanmalı" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "Türkçe" @@ -627,11 +655,11 @@ msgstr "Daha fazla" msgid "Less" msgstr "Az" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Sürüm" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -795,18 +823,33 @@ msgid "" "WebDAV</a>" msgstr "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla eriÅŸmek için</a> bu adresi kullanın" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "Åžifreleme uygulaması artık etkin deÄŸil, tüm dosyalarınızın ÅŸifrelemesini kaldırın" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "Oturum açma parolası" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "Tüm dosyaların ÅŸifresini çöz" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "GiriÅŸ Adı" diff --git a/l10n/tzm/settings.po b/l10n/tzm/settings.po index 5b930052877..d34209d7023 100644 --- a/l10n/tzm/settings.po +++ b/l10n/tzm/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index 55370f19f7d..d6d482e80d9 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "شىÙىرلاش" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "تورخەت ساقلاندى" @@ -115,6 +125,16 @@ msgstr "گۇرۇپپىنى ئۆچۈرەلمىدى" msgid "Unable to delete user" msgstr "ئىشلەتكۈچىنى ئۆچۈرەلمىدى" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "تىل ئۆزگەردى" @@ -226,34 +246,42 @@ msgstr "ÙŠÛÚىلا" msgid "Updated" msgstr "ÙŠÛÚىلاندى" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "ئۆچۈرۈلگەن" @@ -299,7 +327,7 @@ msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش ÙƒÛرەك" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "ئۇيغۇرچە" @@ -624,11 +652,11 @@ msgstr "تÛخىمۇ ÙƒÛ†Ù¾" msgid "Less" msgstr "ئاز" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "نەشرى" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "تىزىمغا كىرىش ئاتى" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 0bc4c6d1762..16a78a603da 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "ШифруваннÑ" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "ÐдреÑу збережено" @@ -115,6 +125,16 @@ msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ групу" msgid "Unable to delete user" msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Мова змінена" @@ -226,34 +246,42 @@ msgstr "Оновити" msgid "Updated" msgstr "Оновлено" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "Дуже Ñлабкий пароль" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "Слабкий пароль" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "Добрий пароль" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "Ðадійний пароль" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "видалені" @@ -299,7 +327,7 @@ msgstr "Потрібно задати вірний пароль" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -624,11 +652,11 @@ msgstr "Більше" msgid "Less" msgstr "Менше" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "ВерÑÑ–Ñ" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Ім'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ" diff --git a/l10n/ur/settings.po b/l10n/ur/settings.po index 56b4ba0d041..073cff5ba22 100644 --- a/l10n/ur/settings.po +++ b/l10n/ur/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po index 1deb22ce7d3..4d782fd7e4f 100644 --- a/l10n/ur_PK/settings.po +++ b/l10n/ur_PK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/uz/settings.po b/l10n/uz/settings.po index e4130ccd539..53b0b5905d7 100644 --- a/l10n/uz/settings.po +++ b/l10n/uz/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-04-26 01:54-0400\n" -"PO-Revision-Date: 2014-04-26 05:54+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index 86e338e72c3..7b5f228ad5c 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "Mã hóa" @@ -99,6 +99,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "LÆ°u email" @@ -115,6 +125,16 @@ msgstr "Không thể xóa nhóm" msgid "Unable to delete user" msgstr "Không thể xóa ngÆ°á»i dùng" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "Ngôn ngữ đã được thay đổi" @@ -226,34 +246,42 @@ msgstr "Cáºp nháºt" msgid "Updated" msgstr "Äã cáºp nháºt" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "đã xóa" @@ -299,7 +327,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__Ngôn ngữ___" @@ -624,11 +652,11 @@ msgstr "hÆ¡n" msgid "Less" msgstr "Ãt" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "Phiên bản" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -792,18 +820,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "Tên đăng nháºp" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 96c58bf718f..12efd3bf854 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" -"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +58,7 @@ msgstr "在å‘é€æµ‹è¯•é‚®ä»¶é’±æ‚¨éœ€è¦è®¾ç½®æ‚¨çš„用户电å邮件" msgid "Send mode" msgstr "å‘é€æ¨¡å¼" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "åŠ å¯†" @@ -105,6 +105,16 @@ msgstr "æ— æ³•è§£å¯†æ‚¨çš„æ–‡ä»¶ï¼Œè¯·æ£€æŸ¥æ‚¨çš„ owncloud.log 或询问管ç†å msgid "Couldn't decrypt your files, check your password and try again" msgstr "æ— æ³•è§£å¯†æ‚¨çš„æ–‡ä»¶ï¼Œè¯·æ£€æŸ¥å¯†ç 并é‡è¯•ã€‚" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "电å邮件已ä¿å˜" @@ -121,6 +131,16 @@ msgstr "æ— æ³•åˆ é™¤ç»„" msgid "Unable to delete user" msgstr "æ— æ³•åˆ é™¤ç”¨æˆ·" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "è¯è¨€å·²ä¿®æ”¹" @@ -232,34 +252,42 @@ msgstr "æ›´æ–°" msgid "Updated" msgstr "已更新" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "选择头åƒ" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "éžå¸¸å¼±çš„密ç " -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "弱密ç " -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "一般强度的密ç " -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "较强的密ç " -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "强密ç " -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "æ£åœ¨è§£å¯†æ–‡ä»¶... 请ç¨ç‰ï¼Œå¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ã€‚" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "å·²ç»åˆ 除" @@ -305,7 +333,7 @@ msgstr "å¿…é¡»æä¾›åˆæ³•çš„密ç " msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "è¦å‘Šï¼šç”¨æˆ· \"{user}\" 的家目录已å˜åœ¨" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "简体ä¸æ–‡" @@ -630,11 +658,11 @@ msgstr "更多" msgid "Less" msgstr "æ›´å°‘" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "版本" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -798,18 +826,33 @@ msgid "" "WebDAV</a>" msgstr "ä½¿ç”¨è¿™ä¸ªåœ°å€ <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "åŠ å¯† app ä¸å†è¢«å¯ç”¨ï¼Œè¯·è§£å¯†æ‚¨æ‰€æœ‰çš„文件" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "登录密ç " -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "解密所有文件" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "登录å称" diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index 82740b14216..5c1bd697d69 100644 --- a/l10n/zh_HK/settings.po +++ b/l10n/zh_HK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "åŠ å¯†" @@ -98,6 +98,16 @@ msgstr "" msgid "Couldn't decrypt your files, check your password and try again" msgstr "" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "" @@ -114,6 +124,16 @@ msgstr "" msgid "Unable to delete user" msgstr "" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "" @@ -225,34 +245,42 @@ msgstr "æ›´æ–°" msgid "Updated" msgstr "" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "" @@ -298,7 +326,7 @@ msgstr "" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "" @@ -623,11 +651,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -791,18 +819,33 @@ msgid "" "WebDAV</a>" msgstr "" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index 287d87f7b65..b1c3b2a44c2 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-11 01:55-0400\n" -"PO-Revision-Date: 2014-05-11 05:02+0000\n" +"POT-Creation-Date: 2014-05-14 01:54-0400\n" +"PO-Revision-Date: 2014-05-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "在準備è¦å¯„出測試郵件時您需è¦è¨å®šæ‚¨çš„使用者郵件。 msgid "Send mode" msgstr "寄é€æ¨¡å¼" -#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149 +#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:150 msgid "Encryption" msgstr "åŠ å¯†" @@ -100,6 +100,16 @@ msgstr "無法解密您的檔案，請檢查您的 owncloud.log 或是詢å•æ‚¨ç msgid "Couldn't decrypt your files, check your password and try again" msgstr "無法解密您的檔案，確èªæ‚¨çš„密碼並å†é‡è©¦ä¸€æ¬¡" +#: ajax/deletekeys.php:14 +msgid "Encryption keys deleted permanently" +msgstr "" + +#: ajax/deletekeys.php:16 +msgid "" +"Couldn't permanently delete your encryption keys, please check your " +"owncloud.log or ask your administrator" +msgstr "" + #: ajax/lostpassword.php:12 msgid "Email saved" msgstr "Email已儲å˜" @@ -116,6 +126,16 @@ msgstr "群組刪除錯誤" msgid "Unable to delete user" msgstr "使用者刪除錯誤" +#: ajax/restorekeys.php:14 +msgid "Backups restored successfully" +msgstr "" + +#: ajax/restorekeys.php:23 +msgid "" +"Couldn't restore your encryption keys, please check your owncloud.log or ask" +" your administrator" +msgstr "" + #: ajax/setlanguage.php:15 msgid "Language changed" msgstr "語言已變更" @@ -227,34 +247,42 @@ msgstr "æ›´æ–°" msgid "Updated" msgstr "已更新" -#: js/personal.js:243 +#: js/personal.js:256 msgid "Select a profile picture" msgstr "é¸æ“‡å¤§é è²¼" -#: js/personal.js:274 +#: js/personal.js:287 msgid "Very weak password" msgstr "éžå¸¸å¼±çš„密碼" -#: js/personal.js:275 +#: js/personal.js:288 msgid "Weak password" msgstr "弱的密碼" -#: js/personal.js:276 +#: js/personal.js:289 msgid "So-so password" msgstr "普通的密碼" -#: js/personal.js:277 +#: js/personal.js:290 msgid "Good password" msgstr "好的密碼" -#: js/personal.js:278 +#: js/personal.js:291 msgid "Strong password" msgstr "很強的密碼" -#: js/personal.js:313 +#: js/personal.js:310 msgid "Decrypting files... Please wait, this can take some time." msgstr "檔案解密ä¸ï¼Œè«‹ç¨å€™ã€‚" +#: js/personal.js:324 +msgid "Delete encryptin keys permanently." +msgstr "" + +#: js/personal.js:338 +msgid "Restore encryptin keys." +msgstr "" + #: js/users.js:47 msgid "deleted" msgstr "已刪除" @@ -300,7 +328,7 @@ msgstr "一定è¦æ供一個有效的密碼" msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "è¦å‘Šï¼šä½¿ç”¨è€… {user} 的家目錄已經å˜åœ¨" -#: personal.php:48 personal.php:49 +#: personal.php:50 personal.php:51 msgid "__language_name__" msgstr "__language_name__" @@ -625,11 +653,11 @@ msgstr "更多" msgid "Less" msgstr "æ›´å°‘" -#: templates/admin.php:433 templates/personal.php:171 +#: templates/admin.php:433 templates/personal.php:202 msgid "Version" msgstr "版本" -#: templates/admin.php:437 templates/personal.php:174 +#: templates/admin.php:437 templates/personal.php:205 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -793,18 +821,33 @@ msgid "" "WebDAV</a>" msgstr "使用這個地å€<a href=\"%s\" target=\"_blank\">來é€éŽ WebDAV å˜å–檔案</a>" -#: templates/personal.php:151 +#: templates/personal.php:156 msgid "The encryption app is no longer enabled, please decrypt all your files" msgstr "åŠ å¯†çš„è»Ÿé«”ä¸èƒ½é•·æ™‚間啟用，請解密所有您的檔案" -#: templates/personal.php:157 +#: templates/personal.php:162 msgid "Log-in password" msgstr "登入密碼" -#: templates/personal.php:162 +#: templates/personal.php:167 msgid "Decrypt all Files" msgstr "解密所有檔案" +#: templates/personal.php:180 +msgid "" +"Your encryption keys are moved to a backup location. If something went wrong" +" you can restore the keys. Only delete them permanently if you are sure that" +" all files are decrypted correctly." +msgstr "" + +#: templates/personal.php:184 +msgid "Restore Encryption Keys" +msgstr "" + +#: templates/personal.php:188 +msgid "Delete Encryption Keys" +msgstr "" + #: templates/users.php:19 msgid "Login Name" msgstr "登入å稱" diff --git a/lib/base.php b/lib/base.php index be613706e64..f3a15e0355f 100644 --- a/lib/base.php +++ b/lib/base.php @@ -175,7 +175,7 @@ class OC { OC::$SERVERROOT . '/lib/private' . PATH_SEPARATOR . OC::$SERVERROOT . '/config' . PATH_SEPARATOR . OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR . - implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR . + implode(PATH_SEPARATOR, $paths) . PATH_SEPARATOR . get_include_path() . PATH_SEPARATOR . OC::$SERVERROOT ); diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index a1f2633fcc5..73e76588dd6 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -56,6 +56,7 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.", "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.", "%s shared »%s« with you" => "%s partilhado »%s« consigo", +"Sharing %s failed, because the user %s is the item owner" => "A partilha %s falhou, porque o utilizador %s é o proprietário", "Could not find category \"%s\"" => "Não foi encontrado a categoria \"%s\"", "seconds ago" => "Minutos atrás", "_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"), diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index 8b845275747..38532d0b3bc 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -43,7 +43,9 @@ $TRANSLATIONS = array( "MySQL/MariaDB username and/or password not valid" => " Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MySQL/MariaDB не дейÑтвительны.", "DB Error: \"%s\"" => "Ошибка БД: \"%s\"", "Offending command was: \"%s\"" => "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\"", +"MySQL/MariaDB user '%s'@'localhost' exists already." => "Пользователь MySQL '%s'@'localhost' уже ÑущеÑтвует.", "Drop this user from MySQL/MariaDB" => "Удалить данного учаÑтника из MySQL/MariaDB", +"MySQL/MariaDB user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже ÑущеÑтвует.", "Drop this user from MySQL/MariaDB." => "Удалить данного учаÑтника из MySQL/MariaDB.", "Oracle connection could not be established" => "Ñоединение Ñ Oracle не может быть уÑтановлено", "Oracle username and/or password not valid" => "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль Oracle", @@ -54,6 +56,15 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб Ñервер до Ñих пор не наÑтроен правильно Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти Ñинхронизации файлов, похоже что проблема в неиÑправноÑти интерфейÑа WebDAV.", "Please double check the <a href='%s'>installation guides</a>." => "ПожалуйÑта, дважды проÑмотрите <a href='%s'>инÑтрукции по уÑтановке</a>.", "%s shared »%s« with you" => "%s поделилÑÑ Â»%s« Ñ Ð²Ð°Ð¼Ð¸", +"Sharing %s failed, because the user %s is the item owner" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s уже ÑвлÑетÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼", +"Sharing %s failed, because the user %s does not exist" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s не ÑущеÑтвует.", +"Sharing %s failed, because this item is already shared with %s" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s ,в виду того что, объект уже находитьÑÑ Ð² общем доÑтупе Ñ %s", +"Sharing %s failed, because the group %s does not exist" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, группа %s не ÑущеÑтвует.", +"Sharing %s failed, because %s is not a member of the group %s" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, %s не ÑвлÑетÑÑ Ñ‡Ð»ÐµÐ½Ð¾Ð¼ группы %s", +"Sharing %s failed, because sharing with links is not allowed" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, потому что обмен Ñо ÑÑылками не допуÑкаетÑÑ", +"Share type %s is not valid for %s" => "Такой втд общего доÑтупа как %s не допуÑтим Ð´Ð»Ñ %s", +"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "ÐаÑтройка прав доÑтупа Ð´Ð»Ñ %s невозможна, поÑкольку права доÑтупа превышают предоÑтавленные права доÑтупа %s", +"Setting permissions for %s failed, because the item was not found" => "Ðе удалоÑÑŒ произвеÑти наÑтройку прав доÑтупа Ð´Ð»Ñ %s , Ñлемент не был найден.", "Could not find category \"%s\"" => "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ \"%s\" не найдена", "seconds ago" => "неÑколько Ñекунд назад", "_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"), @@ -65,6 +76,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n меÑÑц назад","%n меÑÑца назад","%n меÑÑцев назад"), "last year" => "в прошлом году", "years ago" => "неÑколько лет назад", +"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Только Ñледующие Ñимволы допуÑкаютÑÑ Ð² имени пользователÑ: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"", "A valid username must be provided" => "Укажите правильное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ", "A valid password must be provided" => "Укажите валидный пароль", "The username is already being used" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ" diff --git a/lib/private/app.php b/lib/private/app.php index 2f55b54b328..a35248f2552 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -307,7 +307,7 @@ class OC_App{ /** * @brief Get the navigation entries for the $app * @param string $app app - * @return array of the $data added with addNavigationEntry + * @return array an array of the $data added with addNavigationEntry * * Warning: destroys the existing entries */ @@ -660,7 +660,7 @@ class OC_App{ /** * @brief: get a list of all apps in the apps folder - * @return array or app names (string IDs) + * @return array an array of app names (string IDs) * @todo: change the name of this method to getInstalledApps, which is more accurate */ public static function getAllApps() { diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php index 0cd6b3bc35b..5fba7514de0 100644 --- a/lib/private/appconfig.php +++ b/lib/private/appconfig.php @@ -90,7 +90,7 @@ class AppConfig implements \OCP\IAppConfig { /** * @brief Get all apps using the config - * @return array with app ids + * @return array an array of app ids * * This function returns a list of all apps that have at least one * entry in the appconfig table. @@ -109,7 +109,7 @@ class AppConfig implements \OCP\IAppConfig { /** * @brief Get the available keys for an app * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app. Please note that the values are * not returned. diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index 97a6569a0f6..ee492b8a9e5 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -190,8 +190,8 @@ class DIContainer extends SimpleContainer implements IAppContainer{ } /** - * @param $message - * @param $level + * @param string $message + * @param string $level * @return mixed */ function log($message, $level) { diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php index d09e1d3ce2e..2b1387af715 100644 --- a/lib/private/appframework/http.php +++ b/lib/private/appframework/http.php @@ -33,7 +33,7 @@ class Http extends BaseHttp { protected $headers; /** - * @param $_SERVER $server + * @param array $server $_SERVER * @param string $protocolVersion the http version to use defaults to HTTP/1.1 */ public function __construct($server, $protocolVersion='HTTP/1.1') { diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php index 39ca3398c66..442e33ee726 100644 --- a/lib/private/appframework/http/dispatcher.php +++ b/lib/private/appframework/http/dispatcher.php @@ -126,11 +126,11 @@ class Dispatcher { // valid types that will be casted $types = array('int', 'integer', 'bool', 'boolean', 'float'); - foreach($this->reflector->getParameters() as $param) { + foreach($this->reflector->getParameters() as $param => $default) { // try to get the parameter from the request object and cast // it to the type annotated in the @param annotation - $value = $this->request->getParam($param); + $value = $this->request->getParam($param, $default); $type = $this->reflector->getType($param); // if this is submitted using GET or a POST form, 'false' should be diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php index a3bbde6af53..91ea7778d08 100644 --- a/lib/private/appframework/routing/routeconfig.php +++ b/lib/private/appframework/routing/routeconfig.php @@ -61,7 +61,7 @@ class RouteConfig { /** * Creates one route base on the give configuration - * @param $routes + * @param array $routes * @throws \UnexpectedValueException */ private function processSimpleRoutes($routes) @@ -105,7 +105,7 @@ class RouteConfig { * - update * - destroy * - * @param $routes + * @param array $routes */ private function processResources($routes) { @@ -151,7 +151,7 @@ class RouteConfig { /** * Based on a given route name the controller name is generated - * @param $controller + * @param string $controller * @return string */ private function buildControllerName($controller) @@ -161,7 +161,7 @@ class RouteConfig { /** * Based on the action part of the route name the controller method name is generated - * @param $action + * @param string $action * @return string */ private function buildActionName($action) { @@ -170,7 +170,7 @@ class RouteConfig { /** * Generates the id used in the url part o the route url - * @param $resource + * @param string $resource * @return string */ private function buildResourceId($resource) { @@ -179,7 +179,7 @@ class RouteConfig { /** * Underscored strings are converted to camel case strings - * @param $str string + * @param string $str * @return string */ private function underScoreToCamelCase($str) { diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php index c9cdadcca4a..a1519c72809 100644 --- a/lib/private/appframework/utility/controllermethodreflector.php +++ b/lib/private/appframework/utility/controllermethodreflector.php @@ -59,7 +59,12 @@ class ControllerMethodReflector { // get method parameters foreach ($reflection->getParameters() as $param) { - $this->parameters[] = $param->name; + if($param->isOptional()) { + $default = $param->getDefaultValue(); + } else { + $default = null; + } + $this->parameters[$param->name] = $default; } } @@ -81,7 +86,7 @@ class ControllerMethodReflector { /** - * @return array the arguments of the method + * @return array the arguments of the method with key => default value */ public function getParameters() { return $this->parameters; diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php index cbdb565ba35..21a995d9e50 100644 --- a/lib/private/archive/tar.php +++ b/lib/private/archive/tar.php @@ -154,7 +154,7 @@ class OC_Archive_TAR extends OC_Archive{ } /** * get the last modified time of a file in the archive - * @param string path + * @param string $path * @return int */ function mtime($path) { diff --git a/lib/private/avatar.php b/lib/private/avatar.php index e97f55eecaf..45959798476 100644 --- a/lib/private/avatar.php +++ b/lib/private/avatar.php @@ -16,7 +16,7 @@ class OC_Avatar implements \OCP\IAvatar { /** * @brief constructor - * @param $user string user to do avatar-management with + * @param string $user user to do avatar-management with */ public function __construct ($user) { $this->view = new \OC\Files\View('/'.$user); @@ -24,7 +24,7 @@ class OC_Avatar implements \OCP\IAvatar { /** * @brief get the users avatar - * @param $size integer size in px of the avatar, avatars are square, defaults to 64 + * @param int $size size in px of the avatar, avatars are square, defaults to 64 * @return boolean|\OC_Image containing the avatar or false if there's no image */ public function get ($size = 64) { @@ -44,7 +44,7 @@ class OC_Avatar implements \OCP\IAvatar { /** * @brief sets the users avatar - * @param $data mixed OC_Image, imagedata or path to set a new avatar + * @param \OC_Image|resource|string $data OC_Image, imagedata or path to set a new avatar * @throws Exception if the provided file is not a jpg or png image * @throws Exception if the provided image is not valid * @throws \OC\NotSquareException if the image is not square diff --git a/lib/private/avatarmanager.php b/lib/private/avatarmanager.php index 3ca46868ea6..f462e6ac5fd 100644 --- a/lib/private/avatarmanager.php +++ b/lib/private/avatarmanager.php @@ -17,7 +17,7 @@ class AvatarManager implements IAvatarManager { /** * @brief return a user specific instance of \OCP\IAvatar * @see \OCP\IAvatar - * @param $user string the ownCloud user id + * @param string $user the ownCloud user id * @return \OCP\IAvatar */ function getAvatar($user) { diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php index 26c90269349..9fa13c25851 100644 --- a/lib/private/backgroundjob/joblist.php +++ b/lib/private/backgroundjob/joblist.php @@ -31,7 +31,7 @@ class JobList implements IJobList { } /** - * @param \Test\BackgroundJob\TestJob $job + * @param Job|string $job * @param mixed $argument */ public function add($job, $argument = null) { @@ -48,7 +48,7 @@ class JobList implements IJobList { } /** - * @param Job $job + * @param Job|string $job * @param mixed $argument */ public function remove($job, $argument = null) { @@ -70,7 +70,7 @@ class JobList implements IJobList { /** * check if a job is in the list * - * @param $job + * @param Job|string $job * @param mixed $argument * @return bool */ @@ -126,7 +126,7 @@ class JobList implements IJobList { /** * @param int $id - * @return Job + * @return Job|null */ public function getById($id) { $query = $this->conn->prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` = ?'); diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php index feee9cc32b6..4e7c065678e 100644 --- a/lib/private/cache/file.php +++ b/lib/private/cache/file.php @@ -48,7 +48,7 @@ class File { /** * Returns the size of the stored/cached data * - * @param $key + * @param string $key * @return int */ public function size($key) { diff --git a/lib/private/config.php b/lib/private/config.php index 6701ca0532b..4242682af3d 100644 --- a/lib/private/config.php +++ b/lib/private/config.php @@ -65,7 +65,7 @@ class Config { /** * @brief Lists all available config keys - * @return array with key names + * @return array an array of key names * * This function returns all keys saved in config.php. Please note that it * does not return the values. @@ -77,8 +77,8 @@ class Config { /** * @brief Gets a value from config.php * @param string $key key - * @param array|bool|string|null $default = null default value - * @return string the value or $default + * @param mixed $default = null default value + * @return mixed the value or $default * * This function gets the value from config.php. If it does not exist, * $default will be returned. @@ -94,7 +94,7 @@ class Config { /** * @brief Sets a value * @param string $key key - * @param string $value value + * @param mixed $value value * * This function sets the value and writes the config.php. * diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php index 5577273df8c..9ebf5fc05cf 100644 --- a/lib/private/connector/sabre/auth.php +++ b/lib/private/connector/sabre/auth.php @@ -69,6 +69,8 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic { * even if there are no HTTP Basic Auth headers. * In other case, just fallback to the parent implementation. * + * @param Sabre_DAV_Server $server + * @param $realm * @return bool */ public function authenticate(Sabre_DAV_Server $server, $realm) { diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index 66b50a87552..ab9d3e47d0e 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -123,7 +123,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D /** * Returns the data * - * @return string | resource + * @return string|resource */ public function get() { diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php index 65231040fb5..f8495b40524 100644 --- a/lib/private/connector/sabre/filesplugin.php +++ b/lib/private/connector/sabre/filesplugin.php @@ -73,7 +73,7 @@ class OC_Connector_Sabre_FilesPlugin extends Sabre_DAV_ServerPlugin } /** - * @param $filePath + * @param string $filePath * @param Sabre_DAV_INode $node * @throws Sabre_DAV_Exception_BadRequest */ diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php index 1e73e1645c3..c9b8336b57b 100644 --- a/lib/private/connector/sabre/quotaplugin.php +++ b/lib/private/connector/sabre/quotaplugin.php @@ -97,7 +97,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { } /** - * @param $parentUri + * @param string $parentUri * @return mixed */ public function getFreeSpace($parentUri) { diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php index 4299d88017a..26264d4e988 100644 --- a/lib/private/contactsmanager.php +++ b/lib/private/contactsmanager.php @@ -31,7 +31,7 @@ namespace OC { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - for future use. One should always have options! - * @return array of contacts which are arrays of key-value-pairs + * @return array an array of contacts which are arrays of key-value-pairs */ public function search($pattern, $searchProperties = array(), $options = array()) { $result = array(); @@ -72,7 +72,7 @@ namespace OC { * * @param array $properties this array if key-value-pairs defines a contact * @param string $address_book_key identifier of the address book in which the contact shall be created or updated - * @return array representing the contact just created or updated + * @return array an array representing the contact just created or updated */ public function createOrUpdate($properties, $address_book_key) { diff --git a/lib/private/db.php b/lib/private/db.php index 322a13642ae..52bf570d1d0 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -401,7 +401,7 @@ class OC_DB { /** * @brief replaces the ownCloud tables with a new set - * @param $file string path to the MDB2 xml db export file + * @param string $file path to the MDB2 xml db export file */ public static function replaceDB( $file ) { $schemaManager = self::getMDB2SchemaManager(); diff --git a/lib/private/db/connectionwrapper.php b/lib/private/db/connectionwrapper.php index c2cfc21d204..132e76666ab 100644 --- a/lib/private/db/connectionwrapper.php +++ b/lib/private/db/connectionwrapper.php @@ -41,8 +41,8 @@ class ConnectionWrapper implements \OCP\IDBConnection { /** * Insert a row if a matching row doesn't exists. - * @param string The table name (will replace *PREFIX*) to perform the replace on. - * @param array + * @param string $table The table name (will replace *PREFIX*) to perform the replace on. + * @param array $input * * The input array if in the form: * diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php index aaf2ea543b9..d98197445e9 100644 --- a/lib/private/db/mdb2schemamanager.php +++ b/lib/private/db/mdb2schemamanager.php @@ -126,7 +126,7 @@ class MDB2SchemaManager { /** * @brief replaces the ownCloud tables with a new set - * @param $file string path to the MDB2 xml db export file + * @param string $file path to the MDB2 xml db export file */ public function replaceDB( $file ) { $apps = \OC_App::getAllApps(); diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index 1c16d03eab2..597650985fa 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -66,7 +66,7 @@ class MDB2SchemaReader { } /** - * @param\Doctrine\DBAL\Schema\Schema $schema + * @param \Doctrine\DBAL\Schema\Schema $schema * @param \SimpleXMLElement $xml * @throws \DomainException */ @@ -303,7 +303,7 @@ class MDB2SchemaReader { } /** - * @param \SimpleXMLElement | string $xml + * @param \SimpleXMLElement|string $xml * @return bool */ private function asBool($xml) { diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php index 492209b883b..70d1f985a41 100644 --- a/lib/private/db/statementwrapper.php +++ b/lib/private/db/statementwrapper.php @@ -41,7 +41,7 @@ class OC_DB_StatementWrapper { * make execute return the result instead of a bool * * @param array $input - * @return \OC_DB_StatementWrapper | int + * @return \OC_DB_StatementWrapper|int */ public function execute($input=array()) { if(OC_Config::getValue( "log_query", false)) { diff --git a/lib/private/defaults.php b/lib/private/defaults.php index fca798568c5..663c327a3b0 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -185,7 +185,7 @@ class OC_Defaults { /** * Returns mail header color - * @return mail header color + * @return string */ public function getMailHeaderColor() { if ($this->themeExist('getMailHeaderColor')) { diff --git a/lib/private/fileproxy.php b/lib/private/fileproxy.php index 88976c1b8e5..2835e974642 100644 --- a/lib/private/fileproxy.php +++ b/lib/private/fileproxy.php @@ -47,7 +47,7 @@ class OC_FileProxy{ /** * fallback function when a proxy operation is not implemented * @param string $function the name of the proxy operation - * @param mixed + * @param mixed $arguments * * this implements a dummy proxy for all operations */ diff --git a/lib/private/files.php b/lib/private/files.php index c435f8d1684..7c437a16a98 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -225,7 +225,7 @@ class OC_Files { * checks if the selected files are within the size constraint. If not, outputs an error page. * * @param string $dir - * @param array | string $files + * @param array|string $files */ static function validateZipDownload($dir, $files) { if (!OC_Config::getValue('allowZipDownload', true)) { diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index c4f03b4d9ef..3e4f6dfb132 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -109,7 +109,7 @@ class Cache { * get the stored metadata of a file or folder * * @param string/int $file - * @return array | false + * @return array|false */ public function get($file) { if (is_string($file) or $file == '') { @@ -450,7 +450,7 @@ class Cache { * search for files matching $pattern * * @param string $pattern - * @return array of file data + * @return array an array of file data */ public function search($pattern) { @@ -597,7 +597,7 @@ class Cache { * get the path of a file on this storage by it's id * * @param int $id - * @return string | null + * @return string|null */ public function getPathById($id) { $sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?'; @@ -640,7 +640,7 @@ class Cache { /** * normalize the given path - * @param $path + * @param string $path * @return string */ public function normalize($path) { diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index c0bdde06a75..51454a71458 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -61,7 +61,7 @@ class Scanner extends BasicEmitter { * * * * @param string $path - * @return array with metadata of the file + * @return array an array of metadata of the file */ public function getData($path) { if (!$this->storage->isReadable($path)) { @@ -88,7 +88,7 @@ class Scanner extends BasicEmitter { * @param string $file * @param int $reuseExisting * @param bool $parentExistsInCache - * @return array with metadata of the scanned file + * @return array an array of metadata of the scanned file */ public function scanFile($file, $reuseExisting = 0, $parentExistsInCache = false) { if (!self::isPartialFile($file) @@ -174,7 +174,7 @@ class Scanner extends BasicEmitter { * @param string $path * @param bool $recursive * @param int $reuse - * @return array with the meta data of the scanned file or folder + * @return array an array of the meta data of the scanned file or folder */ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) { if ($reuse === -1) { @@ -273,7 +273,7 @@ class Scanner extends BasicEmitter { * @brief check if the file should be ignored when scanning * NOTE: files with a '.part' extension are ignored as well! * prevents unfinished put requests to be scanned - * @param String $file + * @param string $file * @return boolean */ public static function isPartialFile($file) { diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php index 199ce5dee78..95f77a81fa2 100644 --- a/lib/private/files/cache/updater.php +++ b/lib/private/files/cache/updater.php @@ -17,7 +17,7 @@ class Updater { * resolve a path to a storage and internal path * * @param string $path the relative path - * @return array consisting of the storage and the internal path + * @return array an array consisting of the storage and the internal path */ static public function resolvePath($path) { $view = \OC\Files\Filesystem::getView(); diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php index 48aa6f853ce..599752a6eff 100644 --- a/lib/private/files/cache/watcher.php +++ b/lib/private/files/cache/watcher.php @@ -55,7 +55,7 @@ class Watcher { * check $path for updates * * @param string $path - * @return boolean | array true if path was updated, otherwise the cached data is returned + * @return boolean|array true if path was updated, otherwise the cached data is returned */ public function checkUpdate($path) { if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) { diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php index d6940f50bf1..b64c5d4e112 100644 --- a/lib/private/files/fileinfo.php +++ b/lib/private/files/fileinfo.php @@ -147,7 +147,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { } /** - * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER + * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER */ public function getType() { if (isset($this->data['type'])) { diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 52df1bec611..22d15840c32 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -245,7 +245,7 @@ class Filesystem { } /** - * @param $id + * @param string $id * @return Mount\Mount[] */ public static function getMountByStorageId($id) { @@ -256,7 +256,7 @@ class Filesystem { } /** - * @param $id + * @param int $id * @return Mount\Mount[] */ public static function getMountByNumericId($id) { @@ -270,7 +270,7 @@ class Filesystem { * resolve a path to a storage and internal path * * @param string $path - * @return array consisting of the storage and the internal path + * @return array an array consisting of the storage and the internal path */ static public function resolvePath($path) { if (!self::$mounts) { diff --git a/lib/private/files/mapper.php b/lib/private/files/mapper.php index 833d4bd8d1c..666719da12d 100644 --- a/lib/private/files/mapper.php +++ b/lib/private/files/mapper.php @@ -97,8 +97,8 @@ class Mapper } /** - * @param $path - * @param $root + * @param string $path + * @param string $root * @return false|string */ public function stripRootFolder($path, $root) { diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php index 91460b72730..db1f4600c74 100644 --- a/lib/private/files/mount/manager.php +++ b/lib/private/files/mount/manager.php @@ -33,7 +33,7 @@ class Manager { /** * Find the mount for $path * - * @param $path + * @param string $path * @return Mount */ public function find($path) { @@ -61,7 +61,7 @@ class Manager { /** * Find all mounts in $path * - * @param $path + * @param string $path * @return Mount[] */ public function findIn($path) { @@ -112,7 +112,7 @@ class Manager { /** * Find mounts by numeric storage id * - * @param string $id + * @param int $id * @return Mount[] */ public function findByNumericId($id) { diff --git a/lib/private/files/mount/mount.php b/lib/private/files/mount/mount.php index 08d5ddf348b..256630726d2 100644 --- a/lib/private/files/mount/mount.php +++ b/lib/private/files/mount/mount.php @@ -28,7 +28,7 @@ class Mount { private $loader; /** - * @param string | \OC\Files\Storage\Storage $storage + * @param string|\OC\Files\Storage\Storage $storage * @param string $mountpoint * @param array $arguments (optional)\ * @param \OC\Files\Storage\Loader $loader diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php index d9e0ddc2d61..1af34fc2be6 100644 --- a/lib/private/files/node/folder.php +++ b/lib/private/files/node/folder.php @@ -296,7 +296,7 @@ class Folder extends Node implements \OCP\Files\Folder { } /** - * @param $id + * @param int $id * @return \OC\Files\Node\Node[] */ public function getById($id) { diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 8a263d4ce1e..fef33cabd87 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -317,7 +317,7 @@ abstract class Common implements \OC\Files\Storage\Storage { * clean a path, i.e. remove all redundant '.' and '..' * making sure that it can't point to higher than '/' * - * @param $path The path to clean + * @param string $path The path to clean * @return string cleaned path */ public function cleanPath($path) { @@ -347,7 +347,7 @@ abstract class Common implements \OC\Files\Storage\Storage { /** * get the free space in the storage * - * @param $path + * @param string $path * @return int */ public function free_space($path) { diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php index a878b2c5cf6..c57c797f87a 100644 --- a/lib/private/files/storage/wrapper/quota.php +++ b/lib/private/files/storage/wrapper/quota.php @@ -30,7 +30,7 @@ class Quota extends Wrapper { } /** - * @return quota value + * @return int quota value */ public function getQuota() { return $this->quota; diff --git a/lib/private/files/stream/oc.php b/lib/private/files/stream/oc.php index 88e7e062df9..c206b41f55e 100644 --- a/lib/private/files/stream/oc.php +++ b/lib/private/files/stream/oc.php @@ -18,7 +18,15 @@ class OC { static private $rootView; private $path; + + /** + * @var resource + */ private $dirSource; + + /** + * @var resource + */ private $fileSource; private $meta; diff --git a/lib/private/files/type/templatemanager.php b/lib/private/files/type/templatemanager.php index cd1536d2732..e693e7079a5 100644 --- a/lib/private/files/type/templatemanager.php +++ b/lib/private/files/type/templatemanager.php @@ -19,7 +19,7 @@ class TemplateManager { * get the path of the template for a mimetype * * @param string $mimetype - * @return string | null + * @return string|null */ public function getTemplatePath($mimetype) { if (isset($this->templates[$mimetype])) { diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 407f5981957..3b99bd12b8a 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -37,7 +37,7 @@ class View { } public function getAbsolutePath($path = '/') { - if (!$path) { + if ($path === '') { $path = '/'; } if ($path[0] !== '/') { @@ -109,7 +109,7 @@ class View { * resolve a path to a storage and internal path * * @param string $path - * @return array consisting of the storage and the internal path + * @return array an array consisting of the storage and the internal path */ public function resolvePath($path) { $a = $this->getAbsolutePath($path); @@ -168,6 +168,10 @@ class View { } } + /** + * @param string $path + * @return resource + */ public function opendir($path) { return $this->basicOperation('opendir', $path, array('read')); } @@ -552,6 +556,11 @@ class View { } } + /** + * @param string $path + * @param string $mode + * @return resource + */ public function fopen($path, $mode) { $hooks = array(); switch ($mode) { @@ -796,7 +805,7 @@ class View { * @param string $path * @param boolean $includeMountPoints whether to add mountpoint sizes, * defaults to true - * @return \OC\Files\FileInfo | false + * @return \OC\Files\FileInfo|false */ public function getFileInfo($path, $includeMountPoints = true) { $data = array(); @@ -991,7 +1000,7 @@ class View { * change file metadata * * @param string $path - * @param array | \OCP\Files\FileInfo $data + * @param array|\OCP\Files\FileInfo $data * @return int * * returns the fileid of the updated file diff --git a/lib/private/geo.php b/lib/private/geo.php index cd62511f0c1..a0ad2b799ab 100644 --- a/lib/private/geo.php +++ b/lib/private/geo.php @@ -8,8 +8,8 @@ class OC_Geo{ /** * @brief returns the closest timezone to coordinates - * @param $latitude - * @param $longitude + * @param float $latitude + * @param float $longitude * @return mixed Closest timezone */ public static function timezone($latitude, $longitude) { diff --git a/lib/private/group.php b/lib/private/group.php index ea6384bae3e..845b3655bab 100644 --- a/lib/private/group.php +++ b/lib/private/group.php @@ -58,7 +58,7 @@ class OC_Group { /** * @brief set the group backend - * @param \OC_Group_Backend $backend The backend to use for user managment + * @param \OC_Group_Backend $backend The backend to use for user managment * @return bool */ public static function useBackend($backend) { @@ -179,7 +179,7 @@ class OC_Group { /** * @brief Get all groups a user belongs to * @param string $uid Name of the user - * @return array with group names + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -203,7 +203,7 @@ class OC_Group { * @param string $search * @param int|null $limit * @param int|null $offset - * @returns array with group names + * @return array an array of group names * * Returns a list with all groups */ @@ -232,7 +232,7 @@ class OC_Group { * @param string $search * @param int $limit * @param int $offset - * @returns array with user ids + * @return array an array of user ids */ public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { $group = self::getManager()->get($gid); @@ -254,7 +254,7 @@ class OC_Group { * @param string $search * @param int $limit * @param int $offset - * @return array with user ids + * @return array an array of user ids */ public static function usersInGroups($gids, $search = '', $limit = -1, $offset = 0) { $users = array(); @@ -271,7 +271,7 @@ class OC_Group { * @param string $search * @param int $limit * @param int $offset - * @returns array with display names (value) and user ids(key) + * @return array an array of display names (value) and user ids(key) */ public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { return self::getManager()->displayNamesInGroup($gid, $search, $limit, $offset); @@ -283,7 +283,7 @@ class OC_Group { * @param string $search * @param int $limit * @param int $offset - * @return array with display names (Key) user ids (value) + * @return array an array of display names (Key) user ids (value) */ public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) { $displayNames = array(); diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php index cc61fce1615..38522d0c43c 100644 --- a/lib/private/group/backend.php +++ b/lib/private/group/backend.php @@ -69,7 +69,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief Check if backend implements actions * @param int $actions bitwise-or'ed actions - * @return boolean + * @return bool * * Returns the supported actions as int to be * compared with OC_GROUP_BACKEND_CREATE_GROUP etc. @@ -93,7 +93,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { /** * @brief Get all groups a user belongs to * @param string $uid Name of the user - * @return array with group names + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -107,7 +107,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { * @param string $search * @param int $limit * @param int $offset - * @return array with group names + * @return array an array of group names * * Returns a list with all groups */ @@ -131,7 +131,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface { * @param string $search * @param int $limit * @param int $offset - * @return array with user ids + * @return array an array of user ids */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { return array(); diff --git a/lib/private/group/database.php b/lib/private/group/database.php index df0d84d0d2a..91baa3140cc 100644 --- a/lib/private/group/database.php +++ b/lib/private/group/database.php @@ -140,7 +140,7 @@ class OC_Group_Database extends OC_Group_Backend { /** * @brief Get all groups a user belongs to * @param string $uid Name of the user - * @return array with group names + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -163,7 +163,7 @@ class OC_Group_Database extends OC_Group_Backend { * @param string $search * @param int $limit * @param int $offset - * @return array with group names + * @return array an array of group names * * Returns a list with all groups */ @@ -197,7 +197,7 @@ class OC_Group_Database extends OC_Group_Backend { * @param string $search * @param int $limit * @param int $offset - * @return array with user ids + * @return array an array of user ids */ public function usersInGroup($gid, $search = '', $limit = null, $offset = null) { $stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?', @@ -215,9 +215,8 @@ class OC_Group_Database extends OC_Group_Backend { * @brief get the number of all users matching the search string in a group * @param string $gid * @param string $search - * @param int $limit - * @param int $offset - * @return int | false + * @return int|false + * @throws DatabaseException */ public function countUsersInGroup($gid, $search = '') { $stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?'); diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php index 94cbb607ad1..75bab31a337 100644 --- a/lib/private/group/dummy.php +++ b/lib/private/group/dummy.php @@ -29,9 +29,9 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief Try to create a new group * @param string $gid The name of the group to create - * @returns true/false + * @return bool * - * Trys to create a new group. If the group name already exists, false will + * Tries to create a new group. If the group name already exists, false will * be returned. */ public function createGroup($gid) { @@ -45,8 +45,8 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief delete a group - * @param $gid gid of the group to delete - * @returns true/false + * @param string $gid gid of the group to delete + * @return bool * * Deletes a group and removes it from the group_user-table */ @@ -61,9 +61,9 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief is user in group? - * @param $uid uid of the user - * @param $gid gid of the group - * @returns true/false + * @param string $uid uid of the user + * @param string $gid gid of the group + * @return bool * * Checks whether the user is member of a group or not. */ @@ -77,9 +77,9 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief Add a user to a group - * @param $uid Name of the user to add to group - * @param $gid Name of the group in which add the user - * @returns true/false + * @param string $uid Name of the user to add to group + * @param string $gid Name of the group in which add the user + * @return bool * * Adds a user to a group. */ @@ -98,9 +98,9 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief Removes a user from a group - * @param $uid NameUSER of the user to remove from group - * @param $gid Name of the group from which remove the user - * @returns true/false + * @param string $uid Name of the user to remove from group + * @param string $gid Name of the group from which remove the user + * @return bool * * removes the user from a group. */ @@ -118,8 +118,8 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief Get all groups a user belongs to - * @param $uid Name of the user - * @returns array with group names + * @param string $uid Name of the user + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -136,18 +136,23 @@ class OC_Group_Dummy extends OC_Group_Backend { } /** - * @brief get a list of all groups - * @returns array with group names - * - * Returns a list with all groups + * @brief Get a list of all groups + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of group names */ public function getGroups($search = '', $limit = -1, $offset = 0) { return array_keys($this->groups); } /** - * @brief get a list of all users in a group - * @returns array with user ids + * @brief Get a list of all users in a group + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of user IDs */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { if(isset($this->groups[$gid])) { @@ -159,7 +164,11 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief get the number of all users in a group - * @returns int | bool + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return int */ public function countUsersInGroup($gid, $search = '', $limit = -1, $offset = 0) { if(isset($this->groups[$gid])) { diff --git a/lib/private/group/example.php b/lib/private/group/example.php index 3519b9ed92f..76c9ce2433d 100644 --- a/lib/private/group/example.php +++ b/lib/private/group/example.php @@ -28,18 +28,18 @@ abstract class OC_Group_Example { /** * @brief Try to create a new group - * @param $gid The name of the group to create - * @returns true/false + * @param string $gid The name of the group to create + * @return bool * - * Trys to create a new group. If the group name already exists, false will + * Tries to create a new group. If the group name already exists, false will * be returned. */ abstract public static function createGroup($gid); /** * @brief delete a group - * @param $gid gid of the group to delete - * @returns true/false + * @param string $gid gid of the group to delete + * @return bool * * Deletes a group and removes it from the group_user-table */ @@ -47,9 +47,9 @@ abstract class OC_Group_Example { /** * @brief is user in group? - * @param $uid uid of the user - * @param $gid gid of the group - * @returns true/false + * @param string $uid uid of the user + * @param string $gid gid of the group + * @return bool * * Checks whether the user is member of a group or not. */ @@ -57,9 +57,9 @@ abstract class OC_Group_Example { /** * @brief Add a user to a group - * @param $uid Name of the user to add to group - * @param $gid Name of the group in which add the user - * @returns true/false + * @param string $uid Name of the user to add to group + * @param string $gid Name of the group in which add the user + * @return bool * * Adds a user to a group. */ @@ -67,9 +67,9 @@ abstract class OC_Group_Example { /** * @brief Removes a user from a group - * @param $uid NameUSER of the user to remove from group - * @param $gid Name of the group from which remove the user - * @returns true/false + * @param string $uid Name of the user to remove from group + * @param string $gid Name of the group from which remove the user + * @return bool * * removes the user from a group. */ @@ -77,8 +77,8 @@ abstract class OC_Group_Example { /** * @brief Get all groups a user belongs to - * @param $uid Name of the user - * @returns array with group names + * @param string $uid Name of the user + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -87,14 +87,15 @@ abstract class OC_Group_Example { /** * @brief get a list of all groups - * @returns array with group names - * - * Returns a list with all groups + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of group names */ abstract public static function getGroups($search = '', $limit = -1, $offset = 0); /** - * check if a group exists + * @brief Check if a group exists * @param string $gid * @return bool */ @@ -102,8 +103,11 @@ abstract class OC_Group_Example { /** * @brief get a list of all users in a group - * @returns array with user ids + * @param string $gid + * @param string $search + * @param int $limit + * @param int $offset + * @return array an array of user ids */ abstract public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0); - } diff --git a/lib/private/group/group.php b/lib/private/group/group.php index 7593bb68d1a..69641854dc5 100644 --- a/lib/private/group/group.php +++ b/lib/private/group/group.php @@ -26,7 +26,7 @@ class Group { private $usersLoaded; /** - * @var \OC_Group_Backend[] | \OC_Group_Database[] $backend + * @var \OC_Group_Backend[]|\OC_Group_Database[] $backend */ private $backends; @@ -184,7 +184,7 @@ class Group { * returns the number of users matching the search string * * @param string $search - * @return int | bool + * @return int|bool */ public function count($search) { $users = false; diff --git a/lib/private/group/interface.php b/lib/private/group/interface.php index 4ef3663837f..74d288d42c0 100644 --- a/lib/private/group/interface.php +++ b/lib/private/group/interface.php @@ -45,7 +45,7 @@ interface OC_Group_Interface { /** * @brief Get all groups a user belongs to * @param string $uid Name of the user - * @return array with group names + * @return array an array of group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. @@ -57,7 +57,7 @@ interface OC_Group_Interface { * @param string $search * @param int $limit * @param int $offset - * @return array with group names + * @return array an array of group names * * Returns a list with all groups */ @@ -76,7 +76,7 @@ interface OC_Group_Interface { * @param string $search * @param int $limit * @param int $offset - * @return array with user ids + * @return array an array of user ids */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0); diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index d31225e3c2e..f03f7004132 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -28,7 +28,7 @@ use OC\Hooks\PublicEmitter; */ class Manager extends PublicEmitter { /** - * @var \OC_Group_Backend[] | \OC_Group_Database[] $backends + * @var \OC_Group_Backend[]|\OC_Group_Database[] $backends */ private $backends = array(); @@ -165,7 +165,7 @@ class Manager extends PublicEmitter { * @param string $search * @param int $limit * @param int $offset - * @return array with display names (value) and user ids (key) + * @return array an array of display names (value) and user ids (key) */ public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { $group = $this->get($gid); diff --git a/lib/private/helper.php b/lib/private/helper.php index 6bc054bce86..12d82f6fb45 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -32,11 +32,11 @@ class OC_Helper { /** * @brief Creates an url using a defined route - * @param $route + * @param string $route * @param array $parameters * @return * @internal param array $args with param=>value, will be appended to the returned url - * @returns string the url + * @return string the url * * Returns a url to the given app and file. */ @@ -495,7 +495,7 @@ class OC_Helper { /** * detect if a given program is found in the search PATH * - * @param $name + * @param string $name * @param bool $path * @internal param string $program name * @internal param string $optional search path, defaults to $PATH @@ -670,8 +670,8 @@ class OC_Helper { /** * Adds a suffix to the name in case the file exists * - * @param $path - * @param $filename + * @param string $path + * @param string $filename * @return string */ public static function buildNotExistingFileName($path, $filename) { @@ -682,8 +682,8 @@ class OC_Helper { /** * Adds a suffix to the name in case the file exists * - * @param $path - * @param $filename + * @param string $path + * @param string $filename * @return string */ public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) { @@ -775,7 +775,7 @@ class OC_Helper { /** * @brief replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement. * - * @param $string + * @param string $string * @param string $replacement The replacement string. * @param int $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string. * @param int $length Length of the part to be replaced diff --git a/lib/private/hook.php b/lib/private/hook.php index 7ae6496f91d..b715db2d16c 100644 --- a/lib/private/hook.php +++ b/lib/private/hook.php @@ -45,7 +45,7 @@ class OC_Hook{ * @brief emits a signal * @param string $signalclass class name of emitter * @param string $signalname name of signal - * @param array $params default: array() array with additional data + * @param mixed $params default: array() array with additional data * @return bool, true if slots exists or false if not * * Emits a signal. To get data from the slot use references! diff --git a/lib/private/image.php b/lib/private/image.php index 14aa64d12da..341bfaaf818 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -424,7 +424,7 @@ class OC_Image { * @brief Loads an image from an open file handle. * It is the responsibility of the caller to position the pointer at the correct place and to close the handle again. * @param resource $handle - * @return An image resource or false on error + * @return resource|false An image resource or false on error */ public function loadFromFileHandle($handle) { OC_Log::write('core', __METHOD__.'(): Trying', OC_Log::DEBUG); diff --git a/lib/private/installer.php b/lib/private/installer.php index 64e8e3a5e7a..9417c32bc89 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -221,7 +221,7 @@ class OC_Installer{ /** * @brief checks whether or not an app is installed * @param string $app app - * @returns true/false + * @return bool * * Checks whether or not an app is installed, i.e. registered in apps table. */ @@ -313,7 +313,7 @@ class OC_Installer{ /** * @brief Removes an app * @param string $name name of the application to remove - * @param $options array with options + * @param array $options options * @return boolean|null * * This function removes an app. $options is an associative array. The diff --git a/lib/private/l10n.php b/lib/private/l10n.php index c1596a64163..c9d9e8131b1 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -183,7 +183,7 @@ class OC_L10N implements \OCP\IL10N { * * Parts of the code is copied from Habari: * https://github.com/habari/system/blob/master/classes/locale.php - * @param $string string + * @param string $string * @return string */ protected function createPluralFormFunction($string){ @@ -278,7 +278,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief getTranslations - * @returns array Fetch all translations + * @return array Fetch all translations * * Returns an associative array with all translations */ @@ -289,7 +289,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief getPluralFormString - * @returns string containing the gettext "Plural-Forms"-string + * @return string containing the gettext "Plural-Forms"-string * * Returns a string like "nplurals=2; plural=(n != 1);" */ @@ -300,7 +300,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief getPluralFormFunction - * @returns string the plural form function + * @return string the plural form function * * returned function accepts the argument $n */ @@ -314,7 +314,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief get localizations - * @returns array Fetch all localizations + * @return array Fetch all localizations * * Returns an associative array with all localizations */ @@ -327,7 +327,7 @@ class OC_L10N implements \OCP\IL10N { * @brief Localization * @param string $type Type of localization * @param array|int|string $data parameters for this localization - * @returns String or false + * @return String or false * * Returns the localized data. * @@ -381,7 +381,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief Choose a language * @param array $text Associative Array with possible strings - * @returns String + * @return String * * $text is an array 'de' => 'hallo welt', 'en' => 'hello world', ... * @@ -404,7 +404,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief find the best language * @param array|string $app details below - * @returns string language + * @return string language * * If $app is an array, ownCloud assumes that these are the available * languages. Otherwise ownCloud tries to find the files in the l10n @@ -477,7 +477,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief find the l10n directory * @param string $app App that needs to be translated - * @returns directory + * @return directory */ protected static function findI18nDir($app) { // find the i18n dir @@ -497,7 +497,7 @@ class OC_L10N implements \OCP\IL10N { /** * @brief find all available languages for an app * @param string $app App that needs to be translated - * @returns array an array of available languages + * @return array an array of available languages */ public static function findAvailableLanguages($app=null) { $available=array('en');//english is always available @@ -517,7 +517,7 @@ class OC_L10N implements \OCP\IL10N { /** * @param string $app * @param string $lang - * @returns bool + * @return bool */ public static function languageExists($app, $lang) { if ($lang == 'en') {//english is always available diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php index 8c65f368171..d0c3799b9c2 100644 --- a/lib/private/l10n/factory.php +++ b/lib/private/l10n/factory.php @@ -20,8 +20,8 @@ class Factory { /** * get an L10N instance - * @param $app string - * @param $lang string|null + * @param string $app + * @param string|null $lang * @return \OC_L10N */ public function get($app) { diff --git a/lib/private/legacy/appconfig.php b/lib/private/legacy/appconfig.php index cb5cef7e350..209f42ffe38 100644 --- a/lib/private/legacy/appconfig.php +++ b/lib/private/legacy/appconfig.php @@ -35,7 +35,7 @@ class OC_Appconfig { /** * @brief Get all apps using the config - * @return array with app ids + * @return array an array of app ids * * This function returns a list of all apps that have at least one * entry in the appconfig table. @@ -47,7 +47,7 @@ class OC_Appconfig { /** * @brief Get the available keys for an app * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app. Please note that the values are * not returned. diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php index 6c2103179ab..76a53d3f627 100644 --- a/lib/private/legacy/config.php +++ b/lib/private/legacy/config.php @@ -51,7 +51,7 @@ class OC_Config { /** * @brief Lists all available config keys - * @return array with key names + * @return array an array of key names * * This function returns all keys saved in config.php. Please note that it * does not return the values. diff --git a/lib/private/legacy/preferences.php b/lib/private/legacy/preferences.php index fcde12796ca..eed6730a529 100644 --- a/lib/private/legacy/preferences.php +++ b/lib/private/legacy/preferences.php @@ -29,7 +29,7 @@ class OC_Preferences{ public static $object; /** * @brief Get all users using the preferences - * @return array with user ids + * @return array an array of user ids * * This function returns a list of all users that have at least one entry * in the preferences table. @@ -54,7 +54,7 @@ class OC_Preferences{ * @brief Get the available keys for an app * @param string $user user * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app of an user. Please note that the * values are not returned. diff --git a/lib/private/migrate.php b/lib/private/migrate.php index 5bcc11b061b..98c825aafd8 100644 --- a/lib/private/migrate.php +++ b/lib/private/migrate.php @@ -333,7 +333,7 @@ class OC_Migrate{ /** * @brief tries to extract the import zip - * @param $path string path to the zip + * @param string $path path to the zip * @return string path to extract location (with a trailing slash) or false on failure */ static private function extractZip( $path ) { @@ -536,9 +536,9 @@ class OC_Migrate{ /** * @brief imports a new user * @param string $db string path to migration.db - * @param $info object of migration info + * @param object $info object of migration info * @param string|null|int $uid uid to use - * @return array of apps with import statuses, or false on failure. + * @return array an array of apps with import statuses, or false on failure. */ public static function importAppData( $db, $info, $uid=null ) { // Check if the db exists diff --git a/lib/private/migration/content.php b/lib/private/migration/content.php index b0e7a4e9528..d3b2fe836a4 100644 --- a/lib/private/migration/content.php +++ b/lib/private/migration/content.php @@ -35,7 +35,7 @@ class OC_Migration_Content{ /** * @brief sets up the * @param ZipArchive $zip ZipArchive object - * @param $db a database object (required for exporttype user) + * @param object $db a database object (required for exporttype user) * @return bool|null */ public function __construct( $zip, $db=null ) { @@ -45,11 +45,9 @@ class OC_Migration_Content{ } - // @brief prepares the db - // @param $query the sql query to prepare - /** - * @param string $query + * @brief prepares the db + * @param string $query the sql query to prepare */ public function prepare( $query ) { @@ -88,7 +86,7 @@ class OC_Migration_Content{ /** * @brief copys rows to migration.db from the main database - * @param $options array of options. + * @param array $options array of options. * @return bool */ public function copyRows( $options ) { @@ -131,7 +129,7 @@ class OC_Migration_Content{ /** * @brief saves a sql data set into migration.db * @param OC_DB_StatementWrapper $data a sql data set returned from self::prepare()->query() - * @param $options array of copyRows options + * @param array $options array of copyRows options * @return void */ private function insertData( $data, $options ) { @@ -170,8 +168,8 @@ class OC_Migration_Content{ /** * @brief adds a directory to the zip object * @param boolean|string $dir string path of the directory to add - * @param $recursive bool - * @param $internaldir string path of folder to add dir to in zip + * @param bool $recursive + * @param string $internaldir path of folder to add dir to in zip * @return bool */ public function addDir( $dir, $recursive=true, $internaldir='' ) { diff --git a/lib/private/navigationmanager.php b/lib/private/navigationmanager.php index 1f657b9ad80..d7111af03cf 100644 --- a/lib/private/navigationmanager.php +++ b/lib/private/navigationmanager.php @@ -30,7 +30,7 @@ class NavigationManager implements \OCP\INavigationManager { /** * @brief returns all the added Menu entries - * @return array of the added entries + * @return array an array of the added entries */ public function getAll() { return $this->entries; diff --git a/lib/private/ocs.php b/lib/private/ocs.php index 211e8222145..aeb3d259b30 100644 --- a/lib/private/ocs.php +++ b/lib/private/ocs.php @@ -213,8 +213,8 @@ class OC_OCS { } /** - * @param $writer - * @param $data + * @param resource $writer + * @param array $data * @param string $node */ public static function toXml($writer, $data, $node) { diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php index c8bb9425f1a..3ced0af8ee1 100644 --- a/lib/private/ocs/cloud.php +++ b/lib/private/ocs/cloud.php @@ -57,8 +57,8 @@ class OC_OCS_Cloud { * </quota> * </data> * - * @param $parameters object should contain parameter 'userid' which identifies - * the user from whom the information will be returned + * @param array $parameters should contain parameter 'userid' which identifies + * the user from whom the information will be returned */ public static function getUser($parameters) { $return = array(); diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php index 0e3b85d5905..567fe7f87fe 100644 --- a/lib/private/ocs/result.php +++ b/lib/private/ocs/result.php @@ -26,7 +26,7 @@ class OC_OCS_Result{ /** * create the OCS_Result object - * @param $data mixed the data to return + * @param mixed $data the data to return */ public function __construct($data=null, $code=100, $message=null) { if ($data === null) { @@ -42,7 +42,7 @@ class OC_OCS_Result{ /** * optionally set the total number of items available - * @param $items int + * @param int $items */ public function setTotalItems(int $items) { $this->items = $items; @@ -50,7 +50,7 @@ class OC_OCS_Result{ /** * optionally set the the number of items per page - * @param $items int + * @param int $items */ public function setItemsPerPage(int $items) { $this->perPage = $items; diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index b0480caf028..fb8282747eb 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -30,7 +30,7 @@ class OC_OCSClient{ /** * @brief Get the url of the OCS AppStore server. - * @returns string of the AppStore server + * @return string of the AppStore server * * This function returns the url of the OCS AppStore server. It´s possible * to set it in the config file or it will fallback to the default @@ -48,7 +48,7 @@ class OC_OCSClient{ /** * @brief Get the content of an OCS url call. - * @returns string of the response + * @return string of the response * This function calls an OCS server and returns the response. It also sets a sane timeout * @param string $url */ @@ -59,7 +59,7 @@ class OC_OCSClient{ /** * @brief Get all the categories from the OCS server - * @returns array with category ids + * @return array an array of category ids * @note returns NULL if config value appstoreenabled is set to false * This function returns a list of all the application categories on the OCS server */ @@ -92,10 +92,10 @@ class OC_OCSClient{ /** * @brief Get all the applications from the OCS server - * @returns array with application data + * @return array an array of application data * * This function returns a list of all the applications on the OCS server - * @param $categories + * @param array|string $categories * @param int $page * @param string $filter */ @@ -150,7 +150,7 @@ class OC_OCSClient{ /** * @brief Get an the applications from the OCS server * @param string $id - * @returns array with application data + * @return array an array of application data * * This function returns an applications from the OCS server */ @@ -192,7 +192,7 @@ class OC_OCSClient{ /** * @brief Get the download url for an application from the OCS server - * @returns array with application data + * @return array an array of application data * * This function returns an download url for an applications from the OCS server * @param string $id diff --git a/lib/private/preferences.php b/lib/private/preferences.php index d45e6e77089..3cadb6a2e97 100644 --- a/lib/private/preferences.php +++ b/lib/private/preferences.php @@ -69,7 +69,7 @@ class Preferences { /** * @brief Get all users using the preferences - * @return array with user ids + * @return array an array of user ids * * This function returns a list of all users that have at least one entry * in the preferences table. @@ -125,7 +125,7 @@ class Preferences { * @brief Get the available keys for an app * @param string $user user * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app of an user. Please note that the * values are not returned. diff --git a/lib/private/preview.php b/lib/private/preview.php index 2964b83c508..eb932470a47 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -191,7 +191,7 @@ class Preview { /** * @brief set the path of the file you want a thumbnail from * @param string $file - * @return $this + * @return \OC\Preview $this */ public function setFile($file) { $this->file = $file; @@ -217,7 +217,7 @@ class Preview { * @brief set the the max width of the preview * @param int $maxX * @throws \Exception - * @return $this + * @return \OC\Preview $this */ public function setMaxX($maxX = 1) { if ($maxX <= 0) { @@ -238,7 +238,7 @@ class Preview { * @brief set the the max height of the preview * @param int $maxY * @throws \Exception - * @return $this + * @return \OC\Preview $this */ public function setMaxY($maxY = 1) { if ($maxY <= 0) { @@ -258,7 +258,7 @@ class Preview { /** * @brief set whether or not scalingup is enabled * @param bool $scalingUp - * @return $this + * @return \OC\Preview $this */ public function setScalingup($scalingUp) { if ($this->getMaxScaleFactor() === 1) { @@ -382,7 +382,7 @@ class Preview { /** * @brief get possible bigger thumbnails of the given image * @param int $fileId fileId of the original image - * @return array of paths to bigger thumbnails + * @return array an array of paths to bigger thumbnails */ private function getPossibleThumbnails($fileId) { @@ -750,7 +750,7 @@ class Preview { } /** - * @param $fileId + * @param int $fileId * @return string */ private function buildCachePath($fileId) { diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php index 59aaa27ef34..cec5d7c0170 100644 --- a/lib/private/preview/image.php +++ b/lib/private/preview/image.php @@ -22,12 +22,13 @@ class Image extends Provider { } $image = new \OC_Image(); - //check if file is encrypted + if($fileInfo['encrypted'] === true) { - $image->loadFromData(stream_get_contents($fileview->fopen($path, 'r'))); - }else{ - $image->loadFromFile($fileview->getLocalFile($path)); + $fileName = $fileview->toTmpFile($path); + } else { + $fileName = $fileview->getLocalFile($path); } + $image->loadFromFile($fileName); return $image->valid() ? $image : false; } diff --git a/lib/private/request.php b/lib/private/request.php index 90f7488eea5..cf9a316b851 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -18,7 +18,7 @@ class OC_Request { /** * @brief Check overwrite condition * @param string $type - * @returns bool + * @return bool */ private static function isOverwriteCondition($type = '') { $regex = '/' . OC_Config::getValue('overwritecondaddr', '') . '/'; @@ -49,7 +49,7 @@ class OC_Request { /** * @brief Returns the unverified server host from the headers without checking * whether it is a trusted domain - * @returns string the server host + * @return string the server host * * Returns the server host, even if the website uses one or more * reverse proxies @@ -89,7 +89,7 @@ class OC_Request { /** * @brief Returns the server host from the headers, or the first configured * trusted domain if the host isn't in the trusted list - * @returns string the server host + * @return string the server host * * Returns the server host, even if the website uses one or more * reverse proxies @@ -121,7 +121,7 @@ class OC_Request { /** * @brief Returns the server protocol - * @returns string the server protocol + * @return string the server protocol * * Returns the server protocol. It respects reverse proxy servers and load balancers */ @@ -143,7 +143,7 @@ class OC_Request { /** * @brief Returns the request uri - * @returns string the request uri + * @return string the request uri * * Returns the request uri, even if the website uses one or more * reverse proxies diff --git a/lib/private/response.php b/lib/private/response.php index 4905c0a787b..f976925fb2e 100644 --- a/lib/private/response.php +++ b/lib/private/response.php @@ -93,7 +93,7 @@ class OC_Response { /** * @brief Set reponse expire time - * @param $expires date-time when the response expires + * @param string|DateTime $expires date-time when the response expires * string for DateInterval from now * DateTime object when to expire response */ @@ -113,7 +113,7 @@ class OC_Response { /** * Checks and set ETag header, when the request matches sends a * 'not modified' response - * @param $etag token to use for modification check + * @param string $etag token to use for modification check */ static public function setETagHeader($etag) { if (empty($etag)) { @@ -131,7 +131,7 @@ class OC_Response { /** * Checks and set Last-Modified header, when the request matches sends a * 'not modified' response - * @param $lastModified time when the reponse was last modified + * @param int|DateTime|string $lastModified time when the reponse was last modified */ static public function setLastModifiedHeader($lastModified) { if (empty($lastModified)) { diff --git a/lib/private/route/route.php b/lib/private/route/route.php index df80facf9c1..87030ad7853 100644 --- a/lib/private/route/route.php +++ b/lib/private/route/route.php @@ -124,7 +124,7 @@ class Route extends SymfonyRoute implements IRoute { /** * The action to execute when this route matches, includes a file like * it is called directly - * @param $file + * @param string $file * @return void */ public function actionInclude($file) { diff --git a/lib/private/route/router.php b/lib/private/route/router.php index 44b0b941508..a72ac2bb3f1 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -239,7 +239,7 @@ class Router implements IRouter { /** * To isolate the variable scope used inside the $file it is required in it's own method - * @param $file + * @param string $file */ private function requireRouteFile($file) { require_once $file; diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php index 515ec85909a..bc83d569840 100644 --- a/lib/private/share/helper.php +++ b/lib/private/share/helper.php @@ -25,13 +25,14 @@ class Helper extends \OC\Share\Constants { /** * Generate a unique target for the item - * @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 string User that is the owner of shared item - * @param string The suggested target originating from a reshare (optional) - * @param int The id of the parent group share (optional) + * @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 string $uidOwner User that is the owner of shared item + * @param string $suggestedTarget The suggested target originating from a reshare (optional) + * @param int $groupParent The id of the parent group share (optional) + * @throws \Exception * @return string Item target */ public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, @@ -142,9 +143,9 @@ class Helper extends \OC\Share\Constants { /** * Delete all reshares of an item - * @param int Id of item to delete - * @param bool If true, exclude the parent from the delete (optional) - * @param string The user that the parent was shared with (optinal) + * @param int $parent Id of item to delete + * @param bool $excludeParent If true, exclude the parent from the delete (optional) + * @param string $uidOwner The user that the parent was shared with (optional) */ public static function delete($parent, $excludeParent = false, $uidOwner = null) { $ids = array($parent); diff --git a/lib/private/share/hooks.php b/lib/private/share/hooks.php index a33c71eedd2..9ac64d888ea 100644 --- a/lib/private/share/hooks.php +++ b/lib/private/share/hooks.php @@ -22,9 +22,9 @@ namespace OC\Share; class Hooks extends \OC\Share\Constants { - /** + /** * Function that is called after a user is deleted. Cleans up the shares of that user. - * @param array arguments + * @param array $arguments */ public static function post_deleteUser($arguments) { // Delete any items shared with the deleted user @@ -42,7 +42,7 @@ class Hooks extends \OC\Share\Constants { /** * Function that is called after a user is added to a group. * TODO what does it do? - * @param array arguments + * @param array $arguments */ public static function post_addToGroup($arguments) { // Find the group shares and check if the user needs a unique target @@ -76,7 +76,7 @@ class Hooks extends \OC\Share\Constants { /** * Function that is called after a user is removed from a group. Shares are cleaned up. - * @param array arguments + * @param array $arguments */ public static function post_removeFromGroup($arguments) { $sql = 'SELECT `id`, `share_type` FROM `*PREFIX*share`' @@ -95,7 +95,7 @@ class Hooks extends \OC\Share\Constants { /** * Function that is called after a group is removed. Cleans up the shares to that group. - * @param array arguments + * @param array $arguments */ public static function post_deleteGroup($arguments) { $sql = 'SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?'; diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php index 4799db52330..ca0dff6562d 100644 --- a/lib/private/share/mailnotifications.php +++ b/lib/private/share/mailnotifications.php @@ -21,11 +21,30 @@ namespace OC\Share; +use DateTime; + class MailNotifications { - private $senderId; // sender userId - private $from; // sender email address + /** + * sender userId + * @var null|string + */ + private $senderId; + + /** + * sender email address + * @var string + */ + private $from; + + /** + * @var string + */ private $senderDisplayName; + + /** + * @var \OC_L10N + */ private $l; /** @@ -50,8 +69,8 @@ class MailNotifications { * @brief inform users if a file was shared with them * * @param array $recipientList list of recipients - * @param type $itemSource shared item source - * @param type $itemType shared item type + * @param string $itemSource shared item source + * @param string $itemType shared item type * @return array list of user to whom the mail send operation failed */ public function sendInternalShareMail($recipientList, $itemSource, $itemType) { @@ -136,7 +155,7 @@ class MailNotifications { * @param string $filename the shared file * @param string $link link to the shared file * @param int $expiration expiration date (timestamp) - * @return array with the html mail body and the plain text mail body + * @return array an array of the html mail body and the plain text mail body */ private function createMailBody($filename, $link, $expiration) { diff --git a/lib/private/share/searchresultsorter.php b/lib/private/share/searchresultsorter.php index 76abbf30846..91709902fff 100644 --- a/lib/private/share/searchresultsorter.php +++ b/lib/private/share/searchresultsorter.php @@ -18,8 +18,8 @@ class SearchResultSorter { * @param string $search the search term as was given by the user * @param string $key the array key containing the value that should be compared * against - * @param $encoding optional, encoding to use, defaults to UTF-8 - * @param $log optional, an \OC\Log instance + * @param string $encoding optional, encoding to use, defaults to UTF-8 + * @param \OC\Log $log optional */ public function __construct($search, $key, \OC\Log $log = null, $encoding = 'UTF-8') { $this->encoding = $encoding; diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 6f8830e73f2..a8537a916fb 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -254,13 +254,13 @@ class Share extends \OC\Share\Constants { /** * Get the items of item type shared with a user - * @param string Item type - * @param sting user id for which user we want the shares - * @param int Format (optional) Format type must be defined by the backend - * @param mixed Parameters (optional) - * @param int Number of items to return (optional) Returns all by default - * @param boolean include collections (optional) - * @return Return depends on format + * @param string $itemType + * @param string $user id for which user we want the shares + * @param int $format (optional) Format type must be defined by the backend + * @param mixed $parameters (optional) + * @param int $limit Number of items to return (optional) Returns all by default + * @param boolean $includeCollections (optional) + * @return mixed Return depends on format */ public static function getItemsSharedWithUser($itemType, $user, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) { @@ -352,7 +352,7 @@ class Share extends \OC\Share\Constants { * @param string $itemType * @param string $itemSource * @param string $uidOwner Owner of link - * @return Item + * @return array */ public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) { return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, @@ -362,7 +362,7 @@ class Share extends \OC\Share\Constants { /** * Based on the given token the share information will be returned - password protected shares will be verified * @param string $token - * @return array | boolean false will be returned in case the token is unknown or unauthorized + * @return array|boolean false will be returned in case the token is unknown or unauthorized */ public static function getShareByToken($token, $checkPasswordProtection = true) { $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1); @@ -388,8 +388,8 @@ class Share extends \OC\Share\Constants { /** * resolves reshares down to the last real share - * @param $linkItem - * @return $fileOwner + * @param array $linkItem + * @return array file owner */ public static function resolveReShare($linkItem) { @@ -446,7 +446,7 @@ class Share extends \OC\Share\Constants { * @param string $uidOwner * @param boolean $includeCollections * @param boolean $checkExpireDate - * @return Return array of users + * @return array Return array of users */ public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) { @@ -926,6 +926,7 @@ class Share extends \OC\Share\Constants { /** * Get the backend class for the specified item type * @param string $itemType + * @throws \Exception * @return \OCP\Share_Backend */ public static function getBackend($itemType) { @@ -1000,10 +1001,10 @@ class Share extends \OC\Share\Constants { /** * Get shared items from the database * @param string $itemType - * @param string Item source or target (optional) + * @param string $item Item source or target (optional) * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique * @param string $shareWith User or group the item is being shared with - * @param string uidOwner User that is the owner of shared items (optional) + * @param string $uidOwner User that is the owner of shared items (optional) * @param int $format Format to convert items to with formatItems() (optional) * @param mixed $parameters to pass to formatItems() (optional) * @param int $limit Number of items to return, -1 to return all matches (optional) @@ -1353,6 +1354,7 @@ class Share extends \OC\Share\Constants { * @param boolean|array $parentFolder Parent folder target (optional) * @param string $token (optional) * @param string $itemSourceName name of the source item (optional) + * @throws \Exception * @return boolean Returns true on success or false on failure */ private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, @@ -1641,7 +1643,7 @@ class Share extends \OC\Share\Constants { } /** - * @breif construct select statement + * @brief construct select statement * @param int $format * @param boolean $fileDependent ist it a file/folder share or a generla share * @param string $uidOwner diff --git a/lib/private/subadmin.php b/lib/private/subadmin.php index 5b6072987ad..3e8b73d55b0 100644 --- a/lib/private/subadmin.php +++ b/lib/private/subadmin.php @@ -167,7 +167,7 @@ class OC_SubAdmin{ /** * @brief delete all SubAdmins by uid - * @param $parameters + * @param array $parameters * @return boolean */ public static function post_deleteUser($parameters) { @@ -178,7 +178,7 @@ class OC_SubAdmin{ /** * @brief delete all SubAdmins by gid - * @param $parameters + * @param array $parameters * @return boolean */ public static function post_deleteGroup($parameters) { diff --git a/lib/private/tags.php b/lib/private/tags.php index 2e786e3fd7b..0b62caf2dd8 100644 --- a/lib/private/tags.php +++ b/lib/private/tags.php @@ -393,7 +393,7 @@ class Tags implements \OCP\ITags { * * For hooking up on post_deleteUser * - * @param array + * @param array $arguments */ public static function post_deleteUser($arguments) { // Find all objectid/tagId pairs. diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php index 3c42d441efa..3f5312c0a7b 100644 --- a/lib/private/template/functions.php +++ b/lib/private/template/functions.php @@ -70,8 +70,8 @@ function mimetype_icon( $mimetype ) { /** * @brief make preview_icon available as a simple function * Returns the path to the preview of the image. - * @param $path path of file - * @returns link to the preview + * @param string $path path of file + * @return link to the preview * * For further information have a look at OC_Helper::previewIcon */ diff --git a/lib/private/template/resourcelocator.php b/lib/private/template/resourcelocator.php index 8a3dd5e7fa9..900aa6a8f08 100644 --- a/lib/private/template/resourcelocator.php +++ b/lib/private/template/resourcelocator.php @@ -53,13 +53,9 @@ abstract class ResourceLocator { /* * @brief append the $file resource if exist at $root - * @param $root path to check - * @param $file the filename - * @param $web base for path, default map $root to $webroot - */ - /** - * @param string $file - * @param string|false $webroot + * @param string $root path to check + * @param string $file the filename + * @param string|null $webroot base for path, default map $root to $webroot */ protected function appendIfExist($root, $file, $webroot = null) { if (is_file($root.'/'.$file)) { diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index b7ac02a753d..0672ffc4a3d 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -98,7 +98,7 @@ class OC_TemplateLayout extends OC_Template { } /** - * @param $styles + * @param array $styles * @return array */ static public function findStylesheetFiles($styles) { @@ -116,7 +116,7 @@ class OC_TemplateLayout extends OC_Template { } /** - * @param $scripts + * @param array $scripts * @return array */ static public function findJavascriptFiles($scripts) { @@ -175,7 +175,7 @@ class OC_TemplateLayout extends OC_Template { } /** - * @param $files + * @param array $files * @return string */ private static function hashScriptNames($files) diff --git a/lib/private/updater.php b/lib/private/updater.php index 7b09f580176..d8694ac6ed5 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -35,7 +35,7 @@ class Updater extends BasicEmitter { /** * Check if a new version is available * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php' - * @return array | bool + * @return array|bool */ public function check($updaterUrl) { diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index a56b0fe3378..b37ef89d40d 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -30,7 +30,7 @@ class URLGenerator implements IURLGenerator { /** * @brief Creates an url using a defined route - * @param $route + * @param string $route * @param array $parameters * @internal param array $args with param=>value, will be appended to the returned url * @return string the url diff --git a/lib/private/user.php b/lib/private/user.php index 7106d664aca..90aac88cdc8 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -77,7 +77,7 @@ class OC_User { /** * @brief gets available backends * @deprecated - * @returns array of backends + * @return array an array of backends * * Returns the names of all backends. */ @@ -88,7 +88,7 @@ class OC_User { /** * @brief gets used backends * @deprecated - * @returns array of backends + * @return array an array of backends * * Returns the names of all used backends. */ @@ -98,7 +98,7 @@ class OC_User { /** * @brief Adds the backend to the list of used backends - * @param string | OC_User_Backend $backend default: database The backend to use for user management + * @param string|OC_User_Interface $backend default: database The backend to use for user management * @return bool * * Set the User Authentication Module @@ -321,7 +321,7 @@ class OC_User { /** * @brief Check if the user is logged in - * @returns bool + * @return bool * * Checks if the user is logged in */ @@ -517,7 +517,7 @@ class OC_User { /** * @brief Get a list of all users - * @returns array with all uids + * @return array an array of all uids * * Get a list of all users. * @param string $search diff --git a/lib/private/user/backend.php b/lib/private/user/backend.php index f4e5618e04a..8d2f0e935de 100644 --- a/lib/private/user/backend.php +++ b/lib/private/user/backend.php @@ -103,7 +103,7 @@ abstract class OC_User_Backend implements OC_User_Interface { /** * @brief Get a list of all users - * @returns array with all uids + * @return array an array of all uids * * Get a list of all users. */ @@ -140,7 +140,7 @@ abstract class OC_User_Backend implements OC_User_Interface { /** * @brief Get a list of all display names - * @returns array with all displayNames (value) and the corresponding uids (key) + * @return array an array of all displayNames (value) and the corresponding uids (key) * * Get a list of all display names and user ids. */ diff --git a/lib/private/user/database.php b/lib/private/user/database.php index dec38464f98..747895a8a95 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -57,9 +57,9 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Create a new user - * @param $uid The username of the user to create - * @param $password The password of the new user - * @returns true/false + * @param string $uid The username of the user to create + * @param string $password The password of the new user + * @return bool * * Creates a new user. Basic checking of username is done in OC_User * itself, not in its subclasses. @@ -79,8 +79,8 @@ class OC_User_Database extends OC_User_Backend { /** * @brief delete a user - * @param $uid The username of the user to delete - * @returns true/false + * @param string $uid The username of the user to delete + * @return bool * * Deletes a user */ @@ -98,9 +98,9 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Set password - * @param $uid The username - * @param $password The new password - * @returns true/false + * @param string $uid The username + * @param string $password The new password + * @return bool * * Change the password of a user */ @@ -119,9 +119,9 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Set display name - * @param $uid The username - * @param $displayName The new display name - * @returns true/false + * @param string $uid The username + * @param string $displayName The new display name + * @return bool * * Change the display name of a user */ @@ -139,7 +139,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief get display name of the user - * @param $uid user ID of the user + * @param string $uid user ID of the user * @return string display name */ public function getDisplayName($uid) { @@ -149,7 +149,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Get a list of all display names - * @returns array with all displayNames (value) and the correspondig uids (key) + * @return array an array of all displayNames (value) and the correspondig uids (key) * * Get a list of all display names and user ids. */ @@ -169,9 +169,9 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Check if the password is correct - * @param $uid The username - * @param $password The password - * @returns string + * @param string $uid The username + * @param string $password The password + * @return string * * Check if the password is correct without logging in the user * returns the user id or false @@ -203,7 +203,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Load an user in the cache * @param string $uid the username - * @returns boolean + * @return boolean */ private function loadUser($uid) { if (empty($this->cache[$uid])) { @@ -226,7 +226,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief Get a list of all users - * @returns array with all uids + * @return array an array of all uids * * Get a list of all users. */ @@ -273,7 +273,7 @@ class OC_User_Database extends OC_User_Backend { /** * counts the users in the database * - * @return int | bool + * @return int|bool */ public function countUsers() { $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php index 2fb51d02de3..d2ada37c80f 100644 --- a/lib/private/user/dummy.php +++ b/lib/private/user/dummy.php @@ -127,7 +127,7 @@ class OC_User_Dummy extends OC_User_Backend { /** * counts the users in the database * - * @return int | bool + * @return int|bool */ public function countUsers() { return 0; diff --git a/lib/private/user/example.php b/lib/private/user/example.php index b2d0dc25410..4bf3652330e 100644 --- a/lib/private/user/example.php +++ b/lib/private/user/example.php @@ -28,9 +28,9 @@ abstract class OC_User_Example extends OC_User_Backend { /** * @brief Create a new user - * @param $uid The username of the user to create - * @param $password The password of the new user - * @returns true/false + * @param string $uid The username of the user to create + * @param string $password The password of the new user + * @return bool * * Creates a new user. Basic checking of username is done in OC_User * itself, not in its subclasses. @@ -39,9 +39,9 @@ abstract class OC_User_Example extends OC_User_Backend { /** * @brief Set password - * @param $uid The username - * @param $password The new password - * @returns true/false + * @param string $uid The username + * @param string $password The new password + * @return bool * * Change the password of a user */ @@ -49,9 +49,9 @@ abstract class OC_User_Example extends OC_User_Backend { /** * @brief Check if the password is correct - * @param $uid The username - * @param $password The password - * @returns string + * @param string $uid The username + * @param string $password The password + * @return string * * Check if the password is correct without logging in the user * returns the user id or false @@ -60,8 +60,8 @@ abstract class OC_User_Example extends OC_User_Backend { /** * @brief get the user's home directory - * @param $uid The username - * @returns string + * @param string $uid The username + * @return string * * get the user's home directory * returns the path or false diff --git a/lib/private/user/http.php b/lib/private/user/http.php index a0394521012..67f7156b498 100644 --- a/lib/private/user/http.php +++ b/lib/private/user/http.php @@ -27,7 +27,7 @@ class OC_User_HTTP extends OC_User_Backend { /** * split http://user@host/path into a user and url part - * @param string path + * @param string $url * @return array */ private function parseUrl($url) { @@ -46,7 +46,7 @@ class OC_User_HTTP extends OC_User_Backend { /** * check if an url is a valid login - * @param string url + * @param string $url * @return boolean */ private function matchUrl($url) { @@ -55,9 +55,9 @@ class OC_User_HTTP extends OC_User_Backend { /** * @brief Check if the password is correct - * @param $uid The username - * @param $password The password - * @returns string + * @param string $uid The username + * @param string $password The password + * @return string * * Check if the password is correct without logging in the user * returns the user id or false diff --git a/lib/private/user/interface.php b/lib/private/user/interface.php index cdcab3e5d00..e130e5b569c 100644 --- a/lib/private/user/interface.php +++ b/lib/private/user/interface.php @@ -26,27 +26,23 @@ interface OC_User_Interface { /** * @brief Check if backend implements actions * @param $actions bitwise-or'ed actions - * @returns boolean + * @return boolean * * Returns the supported actions as int to be * compared with OC_USER_BACKEND_CREATE_USER etc. - * @return boolean */ public function implementsActions($actions); /** * @brief delete a user - * @param $uid The username of the user to delete - * @returns true/false - * - * Deletes a user - * @return boolean + * @param string $uid The username of the user to delete + * @return bool */ public function deleteUser($uid); /** * @brief Get a list of all users - * @returns array with all uids + * @return array an array of all uids * * Get a list of all users. */ @@ -61,14 +57,14 @@ interface OC_User_Interface { /** * @brief get display name of the user - * @param $uid user ID of the user - * @return display name + * @param string $uid user ID of the user + * @return string display name */ public function getDisplayName($uid); /** * @brief Get a list of all display names - * @returns array with all displayNames (value) and the corresponding uids (key) + * @return array an array of all displayNames (value) and the corresponding uids (key) * * Get a list of all display names and user ids. */ diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index 6f6fd80a8ef..0fcf1ceb6ab 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -26,7 +26,7 @@ use OC\Hooks\PublicEmitter; */ class Manager extends PublicEmitter { /** - * @var \OC_User_Backend[] $backends + * @var \OC_User_Interface[] $backends */ private $backends = array(); @@ -57,7 +57,7 @@ class Manager extends PublicEmitter { /** * register a user backend * - * @param \OC_User_Backend $backend + * @param \OC_User_Interface $backend */ public function registerBackend($backend) { $this->backends[] = $backend; @@ -66,7 +66,7 @@ class Manager extends PublicEmitter { /** * remove a user backend * - * @param \OC_User_Backend $backend + * @param \OC_User_Interface $backend */ public function removeBackend($backend) { $this->cachedUsers = array(); @@ -105,7 +105,7 @@ class Manager extends PublicEmitter { * get or construct the user object * * @param string $uid - * @param \OC_User_Backend $backend + * @param \OC_User_Interface $backend * @return \OC\User\User */ protected function getUserObject($uid, $backend) { @@ -222,7 +222,7 @@ class Manager extends PublicEmitter { * @param string $uid * @param string $password * @throws \Exception - * @return bool | \OC\User\User the created user of false + * @return bool|\OC\User\User the created user of false */ public function createUser($uid, $password) { $l = \OC_L10N::get('lib'); @@ -261,7 +261,7 @@ class Manager extends PublicEmitter { /** * returns how many users per backend exist (if supported by backend) * - * @return array with backend class as key and count number as value + * @return array an array of backend class as key and count number as value */ public function countUsers() { $userCountStatistics = array(); diff --git a/lib/private/user/session.php b/lib/private/user/session.php index 1740bad5abe..3d10b134b83 100644 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -82,7 +82,7 @@ class Session implements Emitter, \OCP\IUserSession { /** * set the currently active user * - * @param \OC\User\User $user + * @param \OC\User\User|null $user */ public function setUser($user) { if (is_null($user)) { @@ -115,7 +115,7 @@ class Session implements Emitter, \OCP\IUserSession { /** * set the login name * - * @param string $loginName for the logged in user + * @param string|null $loginName for the logged in user */ public function setLoginName($loginName) { if (is_null($loginName)) { @@ -191,7 +191,7 @@ class Session implements Emitter, \OCP\IUserSession { $expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15); setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secure_cookie); setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secure_cookie, true); - setcookie("oc_remember_login", true, $expires, \OC::$WEBROOT, '', $secure_cookie); + setcookie("oc_remember_login", "1", $expires, \OC::$WEBROOT, '', $secure_cookie); } /** diff --git a/lib/private/user/user.php b/lib/private/user/user.php index ef5364cbf7b..229cbf68ff1 100644 --- a/lib/private/user/user.php +++ b/lib/private/user/user.php @@ -23,7 +23,7 @@ class User { private $displayName; /** - * @var \OC_User_Backend $backend + * @var \OC_User_Interface $backend */ private $backend; @@ -33,7 +33,7 @@ class User { private $enabled; /** - * @var Emitter | Manager $emitter + * @var Emitter|Manager $emitter */ private $emitter; @@ -49,7 +49,7 @@ class User { /** * @param string $uid - * @param \OC_User_Backend $backend + * @param \OC_User_Interface $backend * @param \OC\Hooks\Emitter $emitter * @param \OC\AllConfig $config */ diff --git a/lib/private/util.php b/lib/private/util.php index e2005d31c38..f76ee7b338a 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -551,6 +551,27 @@ class OC_Util { } /** + * @brief check if a backup from the encryption keys exists + * @return boolean + */ + public static function backupKeysExists() { + //check if encryption was enabled in the past + $backupExists = false; + if (OC_App::isEnabled('files_encryption') === false) { + $view = new OC\Files\View('/' . OCP\User::getUser()); + $backupPath = '/files_encryption/keyfiles.backup'; + if ($view->is_dir($backupPath)) { + $dircontent = $view->getDirectoryContent($backupPath); + if (!empty($dircontent)) { + $backupExists = true; + } + } + } + + return $backupExists; + } + + /** * @brief Check for correct file permissions of data directory * @param string $dataDirectory * @return array arrays with error messages and hints @@ -797,8 +818,8 @@ class OC_Util { * This function is used to sanitize HTML and should be applied on any * string or array of strings before displaying it on a web page. * - * @param string|array of strings - * @return array with sanitized strings or a single sanitized string, depends on the input parameter. + * @param string|array &$value + * @return string|array an array of sanitized strings or a single sanitized string, depends on the input parameter. */ public static function sanitizeHTML( &$value ) { if (is_array($value)) { @@ -837,7 +858,7 @@ class OC_Util { if (!\OC_Config::getValue("check_for_working_htaccess", true)) { return true; } - + // testdata $fileName = '/htaccesstest.txt'; $testContent = 'testcontent'; @@ -1007,8 +1028,8 @@ class OC_Util { /** * @brief Generates a cryptographic secure pseudo-random string - * @param Int $length of the random string - * @return String + * @param int $length of the random string + * @return string * Please also update secureRNGAvailable if you change something here */ public static function generateRandomBytes($length = 30) { @@ -1082,7 +1103,7 @@ class OC_Util { curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10); curl_setopt($curl, CURLOPT_URL, $url); - + curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler"); if(OC_Config::getValue('proxy', '') != '') { @@ -1091,17 +1112,16 @@ class OC_Util { if(OC_Config::getValue('proxyuserpwd', '') != '') { curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd')); } - - if (ini_get('open_basedir') === '' && ini_get('safe_mode' === 'Off')) { + + if (ini_get('open_basedir') === '' && ini_get('safe_mode') === 'Off') { curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_MAXREDIRS, $max_redirects); $data = curl_exec($curl); } else { curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false); $mr = $max_redirects; - if ($mr > 0) { + if ($mr > 0) { $newURL = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL); - $rcurl = curl_copy_handle($curl); curl_setopt($rcurl, CURLOPT_HEADER, true); curl_setopt($rcurl, CURLOPT_NOBODY, true); @@ -1125,9 +1145,9 @@ class OC_Util { curl_close($rcurl); if ($mr > 0) { curl_setopt($curl, CURLOPT_URL, $newURL); - } + } } - + if($mr == 0 && $max_redirects > 0) { $data = false; } else { @@ -1267,7 +1287,7 @@ class OC_Util { /** * Returns whether the given file name is valid - * @param $file string file name to check + * @param string $file file name to check * @return bool true if the file name is valid, false otherwise */ public static function isValidFileName($file) { diff --git a/lib/private/vobject.php b/lib/private/vobject.php index a3e9f7ef790..e472429b23e 100644 --- a/lib/private/vobject.php +++ b/lib/private/vobject.php @@ -25,28 +25,28 @@ */ class OC_VObject{ /** @var Sabre\VObject\Component */ - protected $vobject; + protected $vObject; /** - * @returns Sabre\VObject\Component + * @return Sabre\VObject\Component */ public function getVObject() { - return $this->vobject; + return $this->vObject; } /** * @brief Parses the VObject * @param string $data VObject as string - * @returns Sabre\VObject\Reader|null + * @return Sabre\VObject\Reader|null */ public static function parse($data) { try { Sabre\VObject\Property::$classMap['LAST-MODIFIED'] = 'Sabre\VObject\Property\DateTime'; - $vobject = Sabre\VObject\Reader::read($data); - if ($vobject instanceof Sabre\VObject\Component) { - $vobject = new OC_VObject($vobject); + $vObject = Sabre\VObject\Reader::read($data); + if ($vObject instanceof Sabre\VObject\Component) { + $vObject = new OC_VObject($vObject); } - return $vobject; + return $vObject; } catch (Exception $e) { OC_Log::write('vobject', $e->getMessage(), OC_Log::ERROR); return null; @@ -89,26 +89,26 @@ class OC_VObject{ /** * Constructor - * @param Sabre\VObject\Component or string + * @param Sabre\VObject\Component|string $vobject_or_name */ public function __construct($vobject_or_name) { if (is_object($vobject_or_name)) { - $this->vobject = $vobject_or_name; + $this->vObject = $vobject_or_name; } else { - $this->vobject = new Sabre\VObject\Component($vobject_or_name); + $this->vObject = new Sabre\VObject\Component($vobject_or_name); } } /** * @todo Write documentation - * @param $item + * @param \OC_VObject|\Sabre\VObject\Component $item * @param null $itemValue */ public function add($item, $itemValue = null) { if ($item instanceof OC_VObject) { $item = $item->getVObject(); } - $this->vobject->add($item, $itemValue); + $this->vObject->add($item, $itemValue); } /** @@ -116,7 +116,7 @@ class OC_VObject{ * @param object $name of property * @param object $value of property * @param array|object $parameters of property - * @returns Sabre\VObject\Property newly created + * @return Sabre\VObject\Property newly created */ public function addProperty($name, $value, $parameters=array()) { if(is_array($value)) { @@ -127,26 +127,26 @@ class OC_VObject{ $property->parameters[] = new Sabre\VObject\Parameter($name, $value); } - $this->vobject->add($property); + $this->vObject->add($property); return $property; } public function setUID() { $uid = substr(md5(rand().time()), 0, 10); - $this->vobject->add('UID', $uid); + $this->vObject->add('UID', $uid); } /** * @todo Write documentation - * @param mixed $name + * @param mixed $name * @param string $string */ public function setString($name, $string) { if ($string != '') { $string = strtr($string, array("\r\n"=>"\n")); - $this->vobject->__set($name, $string); + $this->vObject->__set($name, $string); }else{ - $this->vobject->__unset($name); + $this->vObject->__unset($name); } } @@ -167,31 +167,31 @@ class OC_VObject{ if ($datetime instanceof DateTime) { $datetime_element = new Sabre\VObject\Property\DateTime($name); $datetime_element->setDateTime($datetime, $dateType); - $this->vobject->__set($name, $datetime_element); + $this->vObject->__set($name, $datetime_element); }else{ - $this->vobject->__unset($name); + $this->vObject->__unset($name); } } /** * @todo Write documentation - * @param $name + * @param string $name * @return string */ public function getAsString($name) { - return $this->vobject->__isset($name) ? - $this->vobject->__get($name)->value : + return $this->vObject->__isset($name) ? + $this->vObject->__get($name)->value : ''; } /** * @todo Write documentation - * @param $name + * @param string $name * @return array */ public function getAsArray($name) { $values = array(); - if ($this->vobject->__isset($name)) { + if ($this->vObject->__isset($name)) { $values = explode(',', $this->getAsString($name)); $values = array_map('trim', $values); } @@ -200,14 +200,14 @@ class OC_VObject{ /** * @todo Write documentation - * @param $name + * @param string $name * @return array|OC_VObject|\Sabre\VObject\Property */ public function &__get($name) { if ($name == 'children') { - return $this->vobject->children; + return $this->vObject->children; } - $return = $this->vobject->__get($name); + $return = $this->vObject->__get($name); if ($return instanceof Sabre\VObject\Component) { $return = new OC_VObject($return); } @@ -220,7 +220,7 @@ class OC_VObject{ * @param string $value */ public function __set($name, $value) { - return $this->vobject->__set($name, $value); + return $this->vObject->__set($name, $value); } /** @@ -228,7 +228,7 @@ class OC_VObject{ * @param string $name */ public function __unset($name) { - return $this->vobject->__unset($name); + return $this->vObject->__unset($name); } /** @@ -237,16 +237,16 @@ class OC_VObject{ * @return bool */ public function __isset($name) { - return $this->vobject->__isset($name); + return $this->vObject->__isset($name); } /** * @todo Write documentation - * @param $function - * @param $arguments + * @param callable $function + * @param array $arguments * @return mixed */ public function __call($function, $arguments) { - return call_user_func_array(array($this->vobject, $function), $arguments); + return call_user_func_array(array($this->vObject, $function), $arguments); } } diff --git a/lib/public/app.php b/lib/public/app.php index 96162299ec4..bef4e96ae02 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -36,7 +36,7 @@ namespace OCP; class App { /** * Makes ownCloud aware of this app - * @param array with all information + * @param array $data with all information * @return boolean * * @deprecated This method is deprecated. Do not call it anymore. @@ -49,7 +49,7 @@ class App { /** * Adds an entry to the navigation - * @param array containing the data + * @param array $data containing the data * @return boolean * * This function adds a new entry to the navigation visible to users. $data @@ -70,7 +70,7 @@ class App { /** * Marks a navigation entry as active - * @param string id of the entry + * @param string $id id of the entry * @return boolean * * This function sets a navigation entry as active and removes the 'active' @@ -83,8 +83,8 @@ class App { /** * Register a Configuration Screen that should appear in the personal settings section. - * @param $app string appid - * @param $page string page to be included + * @param string $app appid + * @param string $page page to be included * @return void */ public static function registerPersonal( $app, $page ) { diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php index 03b94403b47..562228e1e52 100644 --- a/lib/public/backgroundjob.php +++ b/lib/public/backgroundjob.php @@ -94,7 +94,7 @@ class BackgroundJob { /** * @deprecated * gets all regular tasks - * @return associative array + * @return array * * key is string "$klass-$method", value is array( $klass, $method ) */ @@ -115,7 +115,7 @@ class BackgroundJob { * @deprecated * Gets one queued task * @param int $id ID of the task - * @return BackgroundJob\IJob array + * @return BackgroundJob\IJob|null */ public static function findQueuedTask($id) { $jobList = \OC::$server->getJobList(); @@ -125,7 +125,7 @@ class BackgroundJob { /** * @deprecated * Gets all queued tasks - * @return array with associative arrays + * @return array an array of associative arrays */ public static function allQueuedTasks() { $jobList = \OC::$server->getJobList(); @@ -145,7 +145,7 @@ class BackgroundJob { * @deprecated * Gets all queued tasks of a specific app * @param string $app app name - * @return array with associative arrays + * @return array an array of associative arrays */ public static function queuedTaskWhereAppIs($app) { $jobList = \OC::$server->getJobList(); diff --git a/lib/public/backgroundjob/ijoblist.php b/lib/public/backgroundjob/ijoblist.php index c9b546605b8..366b0e37368 100644 --- a/lib/public/backgroundjob/ijoblist.php +++ b/lib/public/backgroundjob/ijoblist.php @@ -12,7 +12,7 @@ interface IJobList { /** * Add a job to the list * - * @param \OCP\BackgroundJob\IJob |string $job + * @param \OCP\BackgroundJob\IJob|string $job * @param mixed $argument The argument to be passed to $job->run() when the job is exectured * @param string $job * @return void @@ -22,7 +22,7 @@ interface IJobList { /** * Remove a job from the list * - * @param IJob $job + * @param \OCP\BackgroundJob\IJob|string $job * @param mixed $argument * @return void */ @@ -31,7 +31,7 @@ interface IJobList { /** * check if a job is in the list * - * @param $job + * @param \OCP\BackgroundJob\IJob|string $job * @param mixed $argument * @return bool */ diff --git a/lib/public/contacts.php b/lib/public/contacts.php index 1b61d7aa4ff..fb88c13bd1b 100644 --- a/lib/public/contacts.php +++ b/lib/public/contacts.php @@ -87,7 +87,7 @@ namespace OCP { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - for future use. One should always have options! - * @return array of contacts which are arrays of key-value-pairs + * @return array an array of contacts which are arrays of key-value-pairs */ public static function search($pattern, $searchProperties = array(), $options = array()) { $cm = \OC::$server->getContactsManager(); @@ -98,7 +98,7 @@ namespace OCP { * This function can be used to delete the contact identified by the given id * * @param object $id the unique identifier to a contact - * @param $address_book_key + * @param string $address_book_key * @return bool successful or not */ public static function delete($id, $address_book_key) { @@ -111,12 +111,12 @@ namespace OCP { * Otherwise the contact will be updated by replacing the entire data set. * * @param array $properties this array if key-value-pairs defines a contact - * @param $address_book_key string to identify the address book in which the contact shall be created or updated - * @return array representing the contact just created or updated + * @param string $address_book_key identifier of the address book in which the contact shall be created or updated + * @return array an array representing the contact just created or updated */ public static function createOrUpdate($properties, $address_book_key) { $cm = \OC::$server->getContactsManager(); - return $cm->search($properties, $address_book_key); + return $cm->createOrUpdate($properties, $address_book_key); } /** diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php index 005b71f298b..32559220091 100644 --- a/lib/public/contacts/imanager.php +++ b/lib/public/contacts/imanager.php @@ -88,7 +88,7 @@ namespace OCP\Contacts { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - for future use. One should always have options! - * @return array of contacts which are arrays of key-value-pairs + * @return array an array of contacts which are arrays of key-value-pairs */ function search($pattern, $searchProperties = array(), $options = array()); @@ -107,7 +107,7 @@ namespace OCP\Contacts { * * @param array $properties this array if key-value-pairs defines a contact * @param string $address_book_key identifier of the address book in which the contact shall be created or updated - * @return array representing the contact just created or updated + * @return array an array representing the contact just created or updated */ function createOrUpdate($properties, $address_book_key); diff --git a/lib/public/db.php b/lib/public/db.php index cb876b4d1f9..ba3a4724ce0 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -50,7 +50,7 @@ class DB { /** * Insert a row if a matching row doesn't exists. * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix - * @param $input array + * @param array $input * * The input array if in the form: * diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php index 37162e09336..bf0c31918cb 100644 --- a/lib/public/files/fileinfo.php +++ b/lib/public/files/fileinfo.php @@ -104,7 +104,7 @@ interface FileInfo { /** * Check whether this is a file or a folder * - * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER + * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER */ public function getType(); diff --git a/lib/public/iaddressbook.php b/lib/public/iaddressbook.php index dcfe08012e6..70309e8c57a 100644 --- a/lib/public/iaddressbook.php +++ b/lib/public/iaddressbook.php @@ -45,7 +45,7 @@ namespace OCP { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - for future use. One should always have options! - * @return array of contacts which are arrays of key-value-pairs + * @return array an array of contacts which are arrays of key-value-pairs */ public function search($pattern, $searchProperties, $options); // // dummy results @@ -56,7 +56,7 @@ namespace OCP { /** * @param array $properties this array if key-value-pairs defines a contact - * @return array representing the contact just created or updated + * @return array an array representing the contact just created or updated */ public function createOrUpdate($properties); // // dummy diff --git a/lib/public/iappconfig.php b/lib/public/iappconfig.php index 2b014df2e42..16c0752f073 100644 --- a/lib/public/iappconfig.php +++ b/lib/public/iappconfig.php @@ -45,7 +45,7 @@ interface IAppConfig { /** * @brief Get the available keys for an app * @param string $app the app we are looking for - * @return array with key names + * @return array an array of key names * * This function gets all keys of an app. Please note that the values are * not returned. @@ -74,7 +74,7 @@ interface IAppConfig { /** * @brief Get all apps using the config - * @return array with app ids + * @return array an array of app ids * * This function returns a list of all apps that have at least one * entry in the appconfig table. diff --git a/lib/public/iavatar.php b/lib/public/iavatar.php index 43fa32556de..fc7e8e79fed 100644 --- a/lib/public/iavatar.php +++ b/lib/public/iavatar.php @@ -15,7 +15,7 @@ interface IAvatar { /** * @brief get the users avatar - * @param $size integer size in px of the avatar, avatars are square, defaults to 64 + * @param int $size size in px of the avatar, avatars are square, defaults to 64 * @return boolean|\OC_Image containing the avatar or false if there's no image */ function get($size = 64); diff --git a/lib/public/iavatarmanager.php b/lib/public/iavatarmanager.php index 9b185ae0467..b09b456a0da 100644 --- a/lib/public/iavatarmanager.php +++ b/lib/public/iavatarmanager.php @@ -16,7 +16,7 @@ interface IAvatarManager { /** * @brief return a user specific instance of \OCP\IAvatar * @see \OCP\IAvatar - * @param $user string the ownCloud user id + * @param string $user the ownCloud user id * @return \OCP\IAvatar */ function getAvatar($user); diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php index 656b5e7e5b2..3e6624e07e9 100644 --- a/lib/public/idbconnection.php +++ b/lib/public/idbconnection.php @@ -52,8 +52,8 @@ interface IDBConnection { /** * Insert a row if a matching row doesn't exists. - * @param string The table name (will replace *PREFIX*) to perform the replace on. - * @param array + * @param string $table The table name (will replace *PREFIX*) to perform the replace on. + * @param array $input * * The input array if in the form: * diff --git a/lib/public/il10n.php b/lib/public/il10n.php index 1388274c21a..c228be6a0a3 100644 --- a/lib/public/il10n.php +++ b/lib/public/il10n.php @@ -53,7 +53,7 @@ interface IL10N { * Localization * @param string $type Type of localization * @param array $data parameters for this localization - * @return String or false + * @return string|false * * Returns the localized data. * diff --git a/lib/public/itags.php b/lib/public/itags.php index f8ebaa668f1..1cba07e9b53 100644 --- a/lib/public/itags.php +++ b/lib/public/itags.php @@ -62,7 +62,7 @@ interface ITags { * ['id' => 1, 'name' = 'Second tag'], * ] * - * @returns array + * @return array */ public function getTags(); diff --git a/lib/public/route/iroute.php b/lib/public/route/iroute.php index d5610e762a8..f511e7af720 100644 --- a/lib/public/route/iroute.php +++ b/lib/public/route/iroute.php @@ -26,7 +26,7 @@ interface IRoute { * The action to execute when this route matches, includes a file like * it is called directly * - * @param $file + * @param string $file * @return void */ public function actionInclude($file); diff --git a/lib/public/share.php b/lib/public/share.php index b21b3a7b963..33c5069ac57 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -92,13 +92,13 @@ class Share extends \OC\Share\Constants { /** * Get the items of item type shared with a user - * @param string Item type - * @param sting user id for which user we want the shares - * @param int Format (optional) Format type must be defined by the backend - * @param mixed Parameters (optional) - * @param int Number of items to return (optional) Returns all by default - * @param bool include collections (optional) - * @return Return depends on format + * @param string $itemType + * @param string $user for which user we want the shares + * @param int $format (optional) Format type must be defined by the backend + * @param mixed $parameters (optional) + * @param int $limit Number of items to return (optional) Returns all by default + * @param bool $includeCollections (optional) + * @return mixed Return depends on format */ public static function getItemsSharedWithUser($itemType, $user, $format = self::FORMAT_NONE, $parameters = null, $limit = -1, $includeCollections = false) { @@ -111,8 +111,8 @@ class Share extends \OC\Share\Constants { * @param string $itemType * @param string $itemTarget * @param int $format (optional) Format type must be defined by the backend - * @param mixed Parameters (optional) - * @param bool include collections (optional) + * @param mixed $parameters (optional) + * @param bool $includeCollections (optional) * @return mixed Return depends on format */ public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE, @@ -160,7 +160,7 @@ class Share extends \OC\Share\Constants { /** * Based on the given token the share information will be returned - password protected shares will be verified * @param string $token - * @return array | bool false will be returned in case the token is unknown or unauthorized + * @return array|bool false will be returned in case the token is unknown or unauthorized */ public static function getShareByToken($token, $checkPasswordProtection = true) { return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection); @@ -168,8 +168,8 @@ class Share extends \OC\Share\Constants { /** * resolves reshares down to the last real share - * @param $linkItem - * @return $fileOwner + * @param array $linkItem + * @return array file owner */ public static function resolveReShare($linkItem) { return \OC\Share\Share::resolveReShare($linkItem); @@ -213,7 +213,7 @@ class Share extends \OC\Share\Constants { * @param string $uidOwner * @param bool $includeCollections * @param bool $checkExpireDate - * @return Return array of users + * @return array Return array of users */ public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) { return \OC\Share\Share::getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections, $checkExpireDate); diff --git a/lib/public/template.php b/lib/public/template.php index 6cc984b12d5..b1264e0c3ad 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -33,8 +33,8 @@ namespace OCP; /** * Make OC_Helper::imagePath available as a simple function - * @param string app - * @param string image + * @param string $app + * @param string $image * @return string to the image * * @see OC_Helper::imagePath @@ -46,7 +46,7 @@ function image_path( $app, $image ) { /** * Make OC_Helper::mimetypeIcon available as a simple function - * @param string mimetype + * @param string $mimetype * @return string to the image of this file type. */ function mimetype_icon( $mimetype ) { @@ -55,7 +55,7 @@ function mimetype_icon( $mimetype ) { /** * Make preview_icon available as a simple function - * @param string path of file + * @param string $path path to file * @return string to the preview of the image */ function preview_icon( $path ) { @@ -76,7 +76,7 @@ function publicPreview_icon ( $path, $token ) { /** * Make OC_Helper::humanFileSize available as a simple function * Example: 2048 to 2 kB. - * @param int size in bytes + * @param int $size in bytes * @return string size as string */ function human_file_size( $bytes ) { @@ -86,8 +86,8 @@ function human_file_size( $bytes ) { /** * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" - * @param int unix timestamp - * @param boolean date only + * @param int $timestamp unix timestamp + * @param boolean $dateOnly * @return OC_L10N_String human readable interpretation of the timestamp */ function relative_modified_date( $timestamp, $dateOnly = false ) { @@ -98,7 +98,7 @@ function relative_modified_date( $timestamp, $dateOnly = false ) { /** * Return a human readable outout for a file size. * @deprecated human_file_size() instead - * @param integer size of a file in byte + * @param integer $bytes size of a file in byte * @return string human readable interpretation of a file size */ function simple_file_size($bytes) { @@ -108,9 +108,9 @@ function simple_file_size($bytes) { /** * Generate html code for an options block. - * @param $options the options - * @param $selected which one is selected? - * @param array the parameters + * @param array $options the options + * @param mixed $selected which one is selected? + * @param array $params the parameters * @return string html options */ function html_select_options($options, $selected, $params=array()) { diff --git a/lib/public/user.php b/lib/public/user.php index 7bac938b838..925410d37d5 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -45,10 +45,10 @@ class User { /** * Get a list of all users - * @param string search pattern - * @param integer $limit - * @param integer $offset - * @return array with all uids + * @param string $search search pattern + * @param int|null $limit + * @param int|null $offset + * @return array an array of all uids */ public static function getUsers( $search = '', $limit = null, $offset = null ) { return \OC_User::getUsers( $search, $limit, $offset ); @@ -56,7 +56,7 @@ class User { /** * Get the user display name of the user currently logged in. - * @param string user id or null for current user + * @param string|null $user user id or null for current user * @return string display name */ public static function getDisplayName( $user = null ) { @@ -65,10 +65,10 @@ class User { /** * Get a list of all display names and user ids. - * @param string search pattern - * @param int limit - * @param int offset - * @return array with all display names (value) and the correspondig uids (key) + * @param string $search search pattern + * @param int|null $limit + * @param int|null $offset + * @return array an array of all display names (value) and the correspondig uids (key) */ public static function getDisplayNames( $search = '', $limit = null, $offset = null ) { return \OC_User::getDisplayNames( $search, $limit, $offset ); diff --git a/lib/public/util.php b/lib/public/util.php index 3b0fc09f7e5..8aeb03aef8e 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -203,7 +203,7 @@ class Util { /** * Creates an url using a defined route - * @param $route + * @param string $route * @param array $parameters * @internal param array $args with param=>value, will be appended to the returned url * @return string the url @@ -293,7 +293,7 @@ class Util { /** * Returns the script name, even if the website uses one or more reverse proxies - * @returns string the script name + * @return string the script name */ public static function getScriptName() { return(\OC_Request::scriptName()); @@ -380,8 +380,8 @@ class Util { * This function is used to sanitize HTML and should be applied on any * string or array of strings before displaying it on a web page. * - * @param string|array of strings - * @return array with sanitized strings or a single sinitized string, depends on the input parameter. + * @param string|array $value + * @return string|array an array of sanitized strings or a single sinitized string, depends on the input parameter. */ public static function sanitizeHTML( $value ) { return(\OC_Util::sanitizeHTML($value)); @@ -458,7 +458,7 @@ class Util { * * @param string $dir the current folder where the user currently operates * @param int $free the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly - * @return number of bytes representing + * @return int number of bytes representing */ public static function maxUploadFilesize($dir, $free = null) { return \OC_Helper::maxUploadFilesize($dir, $free); @@ -476,7 +476,7 @@ class Util { /** * Calculate PHP upload limit * - * @return number of bytes representing + * @return int number of bytes representing */ public static function uploadLimit() { return \OC_Helper::uploadLimit(); @@ -484,7 +484,7 @@ class Util { /** * Returns whether the given file name is valid - * @param $file string file name to check + * @param string $file file name to check * @return bool true if the file name is valid, false otherwise */ public static function isValidFileName($file) { @@ -493,8 +493,8 @@ class Util { /** * @brief Generates a cryptographic secure pseudo-random string - * @param Int $length of the random string - * @return String + * @param int $length of the random string + * @return string */ public static function generateRandomBytes($length = 30) { return \OC_Util::generateRandomBytes($length); diff --git a/settings/ajax/deletekeys.php b/settings/ajax/deletekeys.php new file mode 100644 index 00000000000..1f84452e117 --- /dev/null +++ b/settings/ajax/deletekeys.php @@ -0,0 +1,17 @@ +<?php + +OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + +$l = \OC_L10N::get('settings'); +$user = \OC_User::getUser(); +$view = new \OC\Files\View('/' . $user . '/files_encryption'); + +$keyfilesDeleted = $view->deleteAll('keyfiles.backup'); +$sharekeysDeleted = $view->deleteAll('share-keys.backup'); + +if ($keyfilesDeleted && $sharekeysDeleted) { + \OCP\JSON::success(array('data' => array('message' => $l->t('Encryption keys deleted permanently')))); +} else { + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t permanently delete your encryption keys, please check your owncloud.log or ask your administrator')))); +} diff --git a/settings/ajax/restorekeys.php b/settings/ajax/restorekeys.php new file mode 100644 index 00000000000..68e19c90457 --- /dev/null +++ b/settings/ajax/restorekeys.php @@ -0,0 +1,24 @@ +<?php + +OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + +$l = \OC_L10N::get('settings'); +$user = \OC_User::getUser(); +$view = new \OC\Files\View('/' . $user . '/files_encryption'); + +$keyfilesRestored = $view->rename('keyfiles.backup', 'keyfiles'); +$sharekeysRestored = $view->rename('share-keys.backup' , 'share-keys'); + +if ($keyfilesRestored && $sharekeysRestored) { + \OCP\JSON::success(array('data' => array('message' => $l->t('Backups restored successfully')))); +} else { + // if one of the move operation was succesful we remove the files back to have a consistent state + if($keyfilesRestored) { + $view->rename('keyfiles', 'keyfiles.backup'); + } + if($sharekeysRestored) { + $view->rename('share-keys' , 'share-keys.backup'); + } + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t restore your encryption keys, please check your owncloud.log or ask your administrator')))); +} diff --git a/settings/css/settings.css b/settings/css/settings.css index 5d8f9a7541c..2056e567b38 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -132,7 +132,8 @@ table.grid td.date{ span.securitywarning {color:#C33; font-weight:bold; } span.connectionwarning {color:#933; font-weight:bold; } table.shareAPI td { padding-bottom: 0.8em; } -table.shareAPI input#shareapi_expire_after_n_days {width: 25px;} +table.shareAPI input#shareapiExpireAfterNDays {width: 25px;} +table.shareAPI .indent { padding-left: 2em; } #mail_settings p label:first-child { display: inline-block; diff --git a/settings/js/admin.js b/settings/js/admin.js index c04c0505deb..cd11e68442a 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -31,6 +31,14 @@ $(document).ready(function(){ OC.AppConfig.setValue('core', $(this).attr('name'), value); }); + $('#shareapiDefaultExpireDate').change(function() { + $("#setDefaultExpireDate").toggleClass('hidden', !this.checked); + }); + + $('#allowLinks').change(function() { + $("#publicLinkSettings").toggleClass('hidden', !this.checked); + }); + $('#security').change(function(){ $.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} ); }); diff --git a/settings/js/personal.js b/settings/js/personal.js index c1f1ef7466b..f297e3c1b1a 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -212,17 +212,30 @@ $(document).ready(function(){ OC.Encryption.decryptAll(privateKeyPassword); }); + + $('button:button[name="submitRestoreKeys"]').click(function() { + $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true); + $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true); + OC.Encryption.restoreKeys(); + }); + + $('button:button[name="submitDeleteKeys"]').click(function() { + $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true); + $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true); + OC.Encryption.deleteKeys(); + }); + $('#decryptAll input:password[name="privateKeyPassword"]').keyup(function(event) { var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val(); if (privateKeyPassword !== '' ) { - $('#decryptAll button:button[name="submitDecryptAll"]').removeAttr("disabled"); + $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", false); if(event.which === 13) { $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true); $('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true); OC.Encryption.decryptAll(privateKeyPassword); } } else { - $('#decryptAll button:button[name="submitDecryptAll"]').attr("disabled", "true"); + $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true); } }); @@ -294,29 +307,59 @@ $(document).ready(function(){ OC.Encryption = { decryptAll: function(password) { - OC.Encryption.msg.startDecrypting('#decryptAll .msg'); + var message = t('settings', 'Decrypting files... Please wait, this can take some time.'); + OC.Encryption.msg.start('#decryptAll .msg', message); $.post('ajax/decryptall.php', {password:password}, function(data) { if (data.status === "error") { - OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data); - $('#decryptAll input:password[name="privateKeyPassword"]').removeAttr("disabled"); + OC.Encryption.msg.finished('#decryptAll .msg', data); + $('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", false); + } else { + OC.Encryption.msg.finished('#decryptAll .msg', data); + } + $('#restoreBackupKeys').removeClass('hidden'); + }); + }, + + deleteKeys: function() { + var message = t('settings', 'Delete encryptin keys permanently.'); + OC.Encryption.msg.start('#restoreBackupKeys .msg', message); + $.post('ajax/deletekeys.php', null, function(data) { + if (data.status === "error") { + OC.Encryption.msg.finished('#restoreBackupKeys .msg', data); + $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false); + $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false); + } else { + OC.Encryption.msg.finished('#restoreBackupKeys .msg', data); + } + }); + }, + + restoreKeys: function() { + var message = t('settings', 'Restore encryptin keys.'); + OC.Encryption.msg.start('#restoreBackupKeys .msg', message); + $.post('ajax/restorekeys.php', {}, function(data) { + if (data.status === "error") { + OC.Encryption.msg.finished('#restoreBackupKeys .msg', data); + $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false); + $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false); } else { - OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data); + OC.Encryption.msg.finished('#restoreBackupKeys .msg', data); } }); } }; OC.Encryption.msg={ - startDecrypting:function(selector){ + start:function(selector, msg){ var spinner = '<img src="'+ OC.imagePath('core', 'loading-small.gif') +'">'; $(selector) - .html( t('settings', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner ) + .html( msg + ' ' + spinner ) .removeClass('success') .removeClass('error') .stop(true, true) .show(); }, - finishedDecrypting:function(selector, data){ + finished:function(selector, data){ if( data.status === "success" ){ $(selector).html( data.data.message ) .addClass('success') diff --git a/settings/personal.php b/settings/personal.php index 0da14a8c8c4..47b2dc1a46a 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -33,7 +33,9 @@ $userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N: $languageCodes=OC_L10N::findAvailableLanguages(); //check if encryption was enabled in the past -$enableDecryptAll = OC_Util::encryptedFiles(); +$filesStillEncrypted = OC_Util::encryptedFiles(); +$backupKeysExists = OC_Util::backupKeysExists(); +$enableDecryptAll = $filesStillEncrypted || $backupKeysExists; // array of common languages $commonlangcodes = array( @@ -92,6 +94,8 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User: $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser())); $tmpl->assign('displayName', OC_User::getDisplayName()); $tmpl->assign('enableDecryptAll' , $enableDecryptAll); +$tmpl->assign('backupKeysExists' , $backupKeysExists); +$tmpl->assign('filesStillEncrypted' , $filesStillEncrypted); $tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true)); $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser())); diff --git a/settings/routes.php b/settings/routes.php index a8bb0d981e8..21d406beeca 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -54,6 +54,10 @@ $this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php') ->actionInclude('settings/ajax/setlanguage.php'); $this->create('settings_ajax_decryptall', '/settings/ajax/decryptall.php') ->actionInclude('settings/ajax/decryptall.php'); +$this->create('settings_ajax_restorekeys', '/settings/ajax/restorekeys.php') + ->actionInclude('settings/ajax/restorekeys.php'); +$this->create('settings_ajax_deletekeys', '/settings/ajax/deletekeys.php') + ->actionInclude('settings/ajax/deletekeys.php'); // apps $this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php') ->actionInclude('settings/ajax/apps/ocs.php'); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index d8a800ca202..4d453b01270 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -217,15 +217,31 @@ if (!$_['internetconnectionworking']) { <input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> /> <label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/> - <em><?php p($l->t('Allow users to share items to the public with links')); ?></em> - </td> - </tr> - <tr> - <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>> + + <div <?php ($_['allowLinks'] === 'yes') ? print_unescaped('class="indent"') : print_unescaped('class="hidden indent"');?> id="publicLinkSettings"> + <input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> /> <label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/> - <em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em> + + <input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" + value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> /> + <label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/> + <div id="setDefaultExpireDate" <?php ($_['shareDefaultExpireDateSet'] === 'no') ? print_unescaped('class="hidden indent"') : print_unescaped('class="indent"');?>> + <?php p($l->t( 'Expire after ' )); ?> + <input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>" + value='<?php p($_['shareExpireAfterNDays']) ?>' /> + <?php p($l->t( 'days' )); ?> + <input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" + value="1" <?php if ($_['shareEnforceExpireDate'] == 'yes') print_unescaped('checked="checked"'); ?> /> + <label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/> + </div> + + </div> + <em><?php p($l->t('Allow users to share items to the public with links')); ?></em> + + + </td> </tr> <tr> @@ -255,22 +271,6 @@ if (!$_['internetconnectionworking']) { </td> </tr> - <tr> - <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>> - <input type="checkbox" name="shareapi_default_expire_date" id="shareapi_default_expire_date" - value="1" <?php if ($_['shareDefaultExpireDateSet'] == 'yes') print_unescaped('checked="checked"'); ?> /> - <label for="shareapi_default_expire_date"><?php p($l->t('Set default expiration date'));?></label><br/> - <?php p($l->t( 'Expire after ' )); ?> - <input type="text" name='shareapi_expire_after_n_days' id="shareapi_expire_after_n_days" placeholder="<?php p('7')?>" - value='<?php p($_['shareExpireAfterNDays']) ?>' /> - <?php p($l->t( 'days' )); ?> - <input type="checkbox" name="shareapi_enforce_expire_date" id="shareapi_enforce_expire_date" - value="1" <?php if ($_['shareEnforceExpireDate'] == 'yes') print_unescaped('checked="checked"'); ?> /> - <label for="shareapi_enforce_expire_date"><?php p($l->t('Enforce expiration date'));?></label><br/> - <em><?php p($l->t('Expire shares by default after N days')); ?></em> - </td> - </tr> - </table> </div> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index cc1fce88c9f..afa3f5d700a 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -144,10 +144,15 @@ if($_['passwordChangeSupported']) { };?> <?php if($_['enableDecryptAll']): ?> -<div class="section" id="decryptAll"> +<div class="section"> + <h2> <?php p( $l->t( 'Encryption' ) ); ?> </h2> + + <?php if($_['filesStillEncrypted']): ?> + + <div id="decryptAll"> <?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?> <p> <input @@ -164,8 +169,34 @@ if($_['passwordChangeSupported']) { <span class="msg"></span> </p> <br /> + </div> + + <?php endif; ?> + + + + <div id="restoreBackupKeys" <?php $_['backupKeysExists'] ? '' : print_unescaped("class='hidden'") ?>> + + <?php p($l->t( "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." )); ?> + <p> + <button + type="button" + name="submitRestoreKeys"><?php p($l->t( "Restore Encryption Keys" )); ?> + </button> + <button + type="button" + name="submitDeleteKeys"><?php p($l->t( "Delete Encryption Keys" )); ?> + </button> + <span class="msg"></span> + + </p> + <br /> + + </div> + + </div> -<?php endif; ?> + <?php endif; ?> <div class="section"> <h2><?php p($l->t('Version'));?></h2> diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php index 2aef2911e2c..8117eec2075 100644 --- a/tests/lib/appframework/http/DispatcherTest.php +++ b/tests/lib/appframework/http/DispatcherTest.php @@ -40,11 +40,11 @@ class TestController extends Controller { * @param int $int * @param bool $bool */ - public function exec($int, $bool) { + public function exec($int, $bool, $test=4, $test2=1) { $this->registerResponder('text', function($in) { return new JSONResponse(array('text' => $in)); }); - return array($int, $bool); + return array($int, $bool, $test, $test2); } } @@ -262,6 +262,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { })); } + public function testControllerParametersInjected() { $this->request = new Request(array( 'post' => array( @@ -280,10 +281,34 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { $this->dispatcherPassthrough(); $response = $this->dispatcher->dispatch($controller, 'exec'); - $this->assertEquals('[3,true]', $response[2]); + $this->assertEquals('[3,true,4,1]', $response[2]); + } + + + public function testControllerParametersInjectedDefaultOverwritten() { + $this->request = new Request(array( + 'post' => array( + 'int' => '3', + 'bool' => 'false', + 'test2' => 7 + ), + 'method' => 'POST' + )); + $this->dispatcher = new Dispatcher( + $this->http, $this->middlewareDispatcher, $this->reflector, + $this->request + ); + $controller = new TestController('app', $this->request); + + // reflector is supposed to be called once + $this->dispatcherPassthrough(); + $response = $this->dispatcher->dispatch($controller, 'exec'); + + $this->assertEquals('[3,true,4,7]', $response[2]); } + public function testResponseTransformedByUrlFormat() { $this->request = new Request(array( 'post' => array( @@ -305,7 +330,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { $this->dispatcherPassthrough(); $response = $this->dispatcher->dispatch($controller, 'exec'); - $this->assertEquals('{"text":[3,false]}', $response[2]); + $this->assertEquals('{"text":[3,false,4,1]}', $response[2]); } @@ -331,7 +356,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { $this->dispatcherPassthrough(); $response = $this->dispatcher->dispatch($controller, 'exec'); - $this->assertEquals('{"text":[3,false]}', $response[2]); + $this->assertEquals('{"text":[3,false,4,1]}', $response[2]); } @@ -359,7 +384,10 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { $this->dispatcherPassthrough(); $response = $this->dispatcher->dispatch($controller, 'exec'); - $this->assertEquals('{"text":[3,true]}', $response[2]); + $this->assertEquals('{"text":[3,true,4,1]}', $response[2]); } + + + } diff --git a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php index cccc7688884..8939a203edb 100644 --- a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php +++ b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php @@ -88,7 +88,7 @@ class ControllerMethodReflectorTest extends \PHPUnit_Framework_TestCase { } - public function arguments($arg, $arg2) {} + public function arguments($arg, $arg2='hi') {} public function testReflectParameters() { $reader = new ControllerMethodReflector(); $reader->reflect( @@ -96,7 +96,7 @@ class ControllerMethodReflectorTest extends \PHPUnit_Framework_TestCase { 'arguments' ); - $this->assertEquals(array('arg', 'arg2'), $reader->getParameters()); + $this->assertEquals(array('arg' => null, 'arg2' => 'hi'), $reader->getParameters()); } @@ -108,7 +108,7 @@ class ControllerMethodReflectorTest extends \PHPUnit_Framework_TestCase { 'arguments2' ); - $this->assertEquals(array('arg',), $reader->getParameters()); + $this->assertEquals(array('arg' => null), $reader->getParameters()); } diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index f80dd06e1cb..201eb9ff6cb 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -585,4 +585,24 @@ class View extends \PHPUnit_Framework_TestCase { $info2 = $view->getFileInfo('/test/test'); $this->assertSame($info['etag'], $info2['etag']); } + + /** + * @dataProvider absolutePathProvider + */ + public function testGetAbsolutePath($expectedPath, $relativePath) { + $view = new \OC\Files\View('/files'); + $this->assertEquals($expectedPath, $view->getAbsolutePath($relativePath)); + } + + function absolutePathProvider() { + return array( + array('/files/', ''), + array('/files/0', '0'), + array('/files/false', 'false'), + array('/files/true', 'true'), + array('/files/', '/'), + array('/files/test', 'test'), + array('/files/test', '/test'), + ); + } } diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php index 990f8ecc1d5..4d15999a826 100644 --- a/tests/lib/group/group.php +++ b/tests/lib/group/group.php @@ -17,9 +17,10 @@ class Group extends \PHPUnit_Framework_TestCase { */ protected function getUserManager() { $userManager = $this->getMock('\OC\User\Manager'); - $user1 = new User('user1', null); - $user2 = new User('user2', null); - $user3 = new User('user3', null); + $backend = $this->getMock('\OC_User_Backend'); + $user1 = new User('user1', $backend); + $user2 = new User('user2', $backend); + $user3 = new User('user3', $backend); $userManager->expects($this->any()) ->method('get') ->will($this->returnValueMap(array( @@ -79,6 +80,7 @@ class Group extends \PHPUnit_Framework_TestCase { public function testInGroupSingleBackend() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -86,13 +88,14 @@ class Group extends \PHPUnit_Framework_TestCase { ->with('user1', 'group1') ->will($this->returnValue(true)); - $this->assertTrue($group->inGroup(new User('user1', null))); + $this->assertTrue($group->inGroup(new User('user1', $userBackend))); } public function testInGroupMultipleBackends() { $backend1 = $this->getMock('OC_Group_Database'); $backend2 = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $backend1->expects($this->once()) @@ -105,12 +108,13 @@ class Group extends \PHPUnit_Framework_TestCase { ->with('user1', 'group1') ->will($this->returnValue(true)); - $this->assertTrue($group->inGroup(new User('user1', null))); + $this->assertTrue($group->inGroup(new User('user1', $userBackend))); } public function testAddUser() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -125,12 +129,13 @@ class Group extends \PHPUnit_Framework_TestCase { ->method('addToGroup') ->with('user1', 'group1'); - $group->addUser(new User('user1', null)); + $group->addUser(new User('user1', $userBackend)); } public function testAddUserAlreadyInGroup() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -144,12 +149,13 @@ class Group extends \PHPUnit_Framework_TestCase { $backend->expects($this->never()) ->method('addToGroup'); - $group->addUser(new User('user1', null)); + $group->addUser(new User('user1', $userBackend)); } public function testRemoveUser() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -164,12 +170,13 @@ class Group extends \PHPUnit_Framework_TestCase { ->method('removeFromGroup') ->with('user1', 'group1'); - $group->removeUser(new User('user1', null)); + $group->removeUser(new User('user1', $userBackend)); } public function testRemoveUserNotInGroup() { $backend = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend), $userManager); $backend->expects($this->once()) @@ -183,13 +190,14 @@ class Group extends \PHPUnit_Framework_TestCase { $backend->expects($this->never()) ->method('removeFromGroup'); - $group->removeUser(new User('user1', null)); + $group->removeUser(new User('user1', $userBackend)); } public function testRemoveUserMultipleBackends() { $backend1 = $this->getMock('OC_Group_Database'); $backend2 = $this->getMock('OC_Group_Database'); $userManager = $this->getUserManager(); + $userBackend = $this->getMock('\OC_User_Backend'); $group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager); $backend1->expects($this->once()) @@ -216,7 +224,7 @@ class Group extends \PHPUnit_Framework_TestCase { ->method('removeFromGroup') ->with('user1', 'group1'); - $group->removeUser(new User('user1', null)); + $group->removeUser(new User('user1', $userBackend)); } public function testSearchUsers() { diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php index 9d1f175c109..061c9e7ea34 100644 --- a/tests/lib/group/manager.php +++ b/tests/lib/group/manager.php @@ -294,10 +294,11 @@ class Manager extends \PHPUnit_Framework_TestCase { * @var \OC\User\Manager $userManager */ $userManager = $this->getMock('\OC\User\Manager'); + $userBackend = $this->getMock('\OC_User_Backend'); $manager = new \OC\Group\Manager($userManager); $manager->addBackend($backend); - $groups = $manager->getUserGroups(new User('user1', null)); + $groups = $manager->getUserGroups(new User('user1', $userBackend)); $this->assertEquals(1, count($groups)); $group1 = $groups[0]; $this->assertEquals('group1', $group1->getGID()); @@ -332,11 +333,12 @@ class Manager extends \PHPUnit_Framework_TestCase { * @var \OC\User\Manager $userManager */ $userManager = $this->getMock('\OC\User\Manager'); + $userBackend = $this->getMock('\OC_User_Backend'); $manager = new \OC\Group\Manager($userManager); $manager->addBackend($backend1); $manager->addBackend($backend2); - $groups = $manager->getUserGroups(new User('user1', null)); + $groups = $manager->getUserGroups(new User('user1', $userBackend)); $this->assertEquals(2, count($groups)); $group1 = $groups[0]; $group2 = $groups[1]; @@ -345,10 +347,12 @@ class Manager extends \PHPUnit_Framework_TestCase { } public function testDisplayNamesInGroupMultipleUserBackends() { - $user1 = new User('user1', null); - $user2 = new User('user2', null); - $user3 = new User('user3', null); - $user4 = new User('user33', null); + $userBackend = $this->getMock('\OC_User_Backend'); + + $user1 = new User('user1', $userBackend); + $user2 = new User('user2', $userBackend); + $user3 = new User('user3', $userBackend); + $user4 = new User('user33', $userBackend); /** * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1 @@ -368,6 +372,7 @@ class Manager extends \PHPUnit_Framework_TestCase { * @var \OC\User\Manager $userManager */ $userManager = $this->getMock('\OC\User\Manager'); + $userBackend = $this->getMock('\OC_User_Backend'); $userManager->expects($this->once()) ->method('search') ->with('user3') @@ -375,12 +380,12 @@ class Manager extends \PHPUnit_Framework_TestCase { $userManager->expects($this->any()) ->method('get') - ->will($this->returnCallback(function($uid) { + ->will($this->returnCallback(function($uid) use ($userBackend) { switch($uid) { - case 'user1' : return new User('user1', null); - case 'user2' : return new User('user2', null); - case 'user3' : return new User('user3', null); - case 'user33': return new User('user33', null); + case 'user1' : return new User('user1', $userBackend); + case 'user2' : return new User('user2', $userBackend); + case 'user3' : return new User('user3', $userBackend); + case 'user33': return new User('user33', $userBackend); default: return null; } |