diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 3d620c5640..e9b07518ba 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -348,4 +348,5 @@ $(document).ready(function() { $('#new>a').click(); }); }); + window.file_upload_param = file_upload_param; }); diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index 648ffce79d..eb724d1954 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "desfés", "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"), "_%n file_::_%n files_" => array("%n fitxer","%n fitxers"), +"{dirs} and {files}" => "{dirs} i {files}", "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"), "files uploading" => "fitxers pujant", "'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 7a5785577a..ce92ff8f18 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -33,15 +33,17 @@ $TRANSLATIONS = array( "cancel" => "cancelar", "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}", "undo" => "deshacer", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("","%n carpetas"), +"_%n file_::_%n files_" => array("","%n archivos"), +"{dirs} and {files}" => "{dirs} y {files}", +"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"), "files uploading" => "subiendo archivos", "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.", "File name cannot be empty." => "El nombre de archivo no puede estar vacío.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ", "Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!", "Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.", "Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes.", "Name" => "Nombre", "Size" => "Tamaño", diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 5a2bb437d3..52ba119170 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "tagasi", "_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"), "_%n file_::_%n files_" => array("%n fail","%n faili"), +"{dirs} and {files}" => "{dirs} ja {files}", "_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"), "files uploading" => "faili üleslaadimisel", "'.' is an invalid file name." => "'.' on vigane failinimi.", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 4e3b0de112..ce19bb60eb 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -33,15 +33,17 @@ $TRANSLATIONS = array( "cancel" => "annuler", "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}", "undo" => "annuler", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), -"_Uploading %n file_::_Uploading %n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n dossier","%n dossiers"), +"_%n file_::_%n files_" => array("%n fichier","%n fichiers"), +"{dirs} and {files}" => "{dir} et {files}", +"_Uploading %n file_::_Uploading %n files_" => array("Téléversement de %n fichier","Téléversement de %n fichiers"), "files uploading" => "fichiers en cours d'envoi", "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.", "File name cannot be empty." => "Le nom de fichier ne peut être vide.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.", "Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !", "Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.", "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.", "Name" => "Nom", "Size" => "Taille", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 6ec1816308..01a6b54f84 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "desfacer", "_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"), "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), +"{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"), "files uploading" => "ficheiros enviándose", "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index 4b22b080b2..d8edf7173a 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -33,15 +33,17 @@ $TRANSLATIONS = array( "cancel" => "anuluj", "replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}", "undo" => "cofnij", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), -"_Uploading %n file_::_Uploading %n files_" => array("","",""), +"_%n folder_::_%n folders_" => array("%n katalog","%n katalogi","%n katalogów"), +"_%n file_::_%n files_" => array("%n plik","%n pliki","%n plików"), +"{dirs} and {files}" => "{katalogi} and {pliki}", +"_Uploading %n file_::_Uploading %n files_" => array("Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"), "files uploading" => "pliki wczytane", "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.", "File name cannot be empty." => "Nazwa pliku nie może być pusta.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.", "Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!", "Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.", "Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.", "Name" => "Nazwa", "Size" => "Rozmiar", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 15d0c170e6..de9644bd58 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "undo" => "desfazer", "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), +"{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("",""), "files uploading" => "enviando arquivos", "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.", @@ -42,6 +43,7 @@ $TRANSLATIONS = array( "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.", "Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!", "Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.", "Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.", "Name" => "Nome", "Size" => "Tamanho", diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index bef440b81b..ba48960416 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -104,7 +104,7 @@ -
+

t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?> diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index de306462d7..85169e6a1d 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -36,14 +36,6 @@ class Hooks { */ public static function login($params) { $l = new \OC_L10N('files_encryption'); - //check if all requirements are met - if(!Helper::checkRequirements() || !Helper::checkConfiguration() ) { - $error_msg = $l->t("Missing requirements."); - $hint = $l->t('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.'); - \OC_App::disable('files_encryption'); - \OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR); - \OCP\Template::printErrorPage($error_msg, $hint); - } $view = new \OC_FilesystemView('/'); @@ -54,6 +46,15 @@ class Hooks { $util = new Util($view, $params['uid']); + //check if all requirements are met + if(!$util->ready() && (!Helper::checkRequirements() || !Helper::checkConfiguration())) { + $error_msg = $l->t("Missing requirements."); + $hint = $l->t('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.'); + \OC_App::disable('files_encryption'); + \OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR); + \OCP\Template::printErrorPage($error_msg, $hint); + } + // setup user, if user not ready force relogin if (Helper::setupUser($util, $params['password']) === false) { return false; diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php index 8341bafc9f..2d644708c5 100644 --- a/apps/files_encryption/l10n/es.php +++ b/apps/files_encryption/l10n/es.php @@ -10,6 +10,8 @@ $TRANSLATIONS = array( "Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.", "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.", "Missing requirements." => "Requisitos incompletos.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.", +"Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:", "Saving..." => "Guardando...", "Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.", "You can unlock your private key in your " => "Puede desbloquear su clave privada en su", diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php index 12af810139..358937441e 100644 --- a/apps/files_encryption/l10n/fr.php +++ b/apps/files_encryption/l10n/fr.php @@ -10,6 +10,8 @@ $TRANSLATIONS = array( "Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.", "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.", "Missing requirements." => "Système minimum requis non respecté.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.", +"Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :", "Saving..." => "Enregistrement...", "Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.", "You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre", diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php index 49dcf817fb..323291bbfb 100644 --- a/apps/files_encryption/l10n/hu_HU.php +++ b/apps/files_encryption/l10n/hu_HU.php @@ -1,6 +1,18 @@ "Visszaállítási kulcs sikeresen kikapcsolva", +"Password successfully changed." => "Jelszó sikeresen megváltoztatva.", +"Could not change the password. Maybe the old password was not correct." => "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.", +"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kérlek győződj meg arról, hogy PHP 5.3.3 vagy annál frissebb van telepítve, valamint a PHP-hez tartozó OpenSSL bővítmény be van-e kapcsolva és az helyesen van-e konfigurálva! Ki lett kapcsolva ideiglenesen a titkosító alkalmazás.", "Saving..." => "Mentés...", -"Encryption" => "Titkosítás" +"personal settings" => "személyes beállítások", +"Encryption" => "Titkosítás", +"Enabled" => "Bekapcsolva", +"Disabled" => "Kikapcsolva", +"Change Password" => "Jelszó megváltoztatása", +"Old log-in password" => "Régi bejelentkezési jelszó", +"Current log-in password" => "Jelenlegi bejelentkezési jelszó", +"Update Private Key Password" => "Privát kulcs jelszó frissítése", +"Enable password recovery:" => "Jelszó-visszaállítás bekapcsolása" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index e129bc9313..c009718160 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -52,14 +52,14 @@ class Crypt { $return = false; - $res = openssl_pkey_new(array('private_key_bits' => 4096)); + $res = Helper::getOpenSSLPkey(); if ($res === false) { \OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR); while ($msg = openssl_error_string()) { \OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails: ' . $msg, \OCP\Util::ERROR); } - } elseif (openssl_pkey_export($res, $privateKey)) { + } elseif (openssl_pkey_export($res, $privateKey, null, Helper::getOpenSSLConfig())) { // Get public key $keyDetails = openssl_pkey_get_details($res); $publicKey = $keyDetails['key']; @@ -70,7 +70,9 @@ class Crypt { ); } else { \OCP\Util::writeLog('Encryption library', 'couldn\'t export users private key, please check your servers openSSL configuration.' . \OCP\User::getUser(), \OCP\Util::ERROR); - \OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR); + while($errMsg = openssl_error_string()) { + \OCP\Util::writeLog('Encryption library', $errMsg, \OCP\Util::ERROR); + } } return $return; diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php index 0209a5d18b..445d7ff8ca 100755 --- a/apps/files_encryption/lib/helper.php +++ b/apps/files_encryption/lib/helper.php @@ -265,7 +265,7 @@ class Helper { * @return bool true if configuration seems to be OK */ public static function checkConfiguration() { - if(openssl_pkey_new(array('private_key_bits' => 4096))) { + if(self::getOpenSSLPkey()) { return true; } else { while ($msg = openssl_error_string()) { @@ -275,6 +275,26 @@ class Helper { } } + /** + * Create an openssl pkey with config-supplied settings + * WARNING: This initializes a new private keypair, which is computationally expensive + * @return resource The pkey resource created + */ + public static function getOpenSSLPkey() { + return openssl_pkey_new(self::getOpenSSLConfig()); + } + + /** + * Return an array of OpenSSL config options, default + config + * Used for multiple OpenSSL functions + * @return array The combined defaults and config settings + */ + public static function getOpenSSLConfig() { + $config = array('private_key_bits' => 4096); + $config = array_merge(\OCP\Config::getSystemValue('openssl', array()), $config); + return $config; + } + /** * @brief glob uses different pattern than regular expressions, escape glob pattern only * @param unescaped path diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php index 1f238d083f..e163da766f 100644 --- a/apps/files_sharing/l10n/es.php +++ b/apps/files_sharing/l10n/es.php @@ -3,7 +3,7 @@ $TRANSLATIONS = array( "The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" => "Contraseña", "Submit" => "Enviar", -"Sorry, this link doesn’t seem to work anymore." => "Este enlace parece no funcionar más.", +"Sorry, this link doesn’t seem to work anymore." => "Vaya, este enlace parece que no volverá a funcionar.", "Reasons might be:" => "Las causas podrían ser:", "the item was removed" => "el elemento fue eliminado", "the link expired" => "el enlace expiró", diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php index b263cd8795..c97a1db97e 100644 --- a/apps/files_sharing/l10n/fr.php +++ b/apps/files_sharing/l10n/fr.php @@ -3,6 +3,12 @@ $TRANSLATIONS = array( "The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.", "Password" => "Mot de passe", "Submit" => "Envoyer", +"Sorry, this link doesn’t seem to work anymore." => "Désolé, mais le lien semble ne plus fonctionner.", +"Reasons might be:" => "Les raisons peuvent être :", +"the item was removed" => "l'item a été supprimé", +"the link expired" => "le lien a expiré", +"sharing is disabled" => "le partage est désactivé", +"For more info, please ask the person who sent this link." => "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.", "%s shared the folder %s with you" => "%s a partagé le répertoire %s avec vous", "%s shared the file %s with you" => "%s a partagé le fichier %s avec vous", "Download" => "Télécharger", diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php index 956d89ae68..a5639c2c71 100644 --- a/apps/files_trashbin/l10n/es.php +++ b/apps/files_trashbin/l10n/es.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Eliminar permanentemente", "Name" => "Nombre", "Deleted" => "Eliminado", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"), +"_%n file_::_%n files_" => array("%n archivo","%n archivos"), "restored" => "recuperado", "Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!", "Restore" => "Recuperar", diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php index 8854190e2c..45527805ce 100644 --- a/apps/files_trashbin/l10n/fr.php +++ b/apps/files_trashbin/l10n/fr.php @@ -8,8 +8,9 @@ $TRANSLATIONS = array( "Delete permanently" => "Supprimer de façon définitive", "Name" => "Nom", "Deleted" => "Effacé", -"_%n folder_::_%n folders_" => array("",""), -"_%n file_::_%n files_" => array("",""), +"_%n folder_::_%n folders_" => array("","%n dossiers"), +"_%n file_::_%n files_" => array("","%n fichiers"), +"restored" => "restauré", "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !", "Restore" => "Restaurer", "Delete" => "Supprimer", diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php index e8295e2ff0..c838a6b956 100644 --- a/apps/files_trashbin/l10n/pl.php +++ b/apps/files_trashbin/l10n/pl.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Trwale usuń", "Name" => "Nazwa", "Deleted" => "Usunięte", -"_%n folder_::_%n folders_" => array("","",""), -"_%n file_::_%n files_" => array("","",""), +"_%n folder_::_%n folders_" => array("","","%n katalogów"), +"_%n file_::_%n files_" => array("","","%n plików"), "restored" => "przywrócony", "Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!", "Restore" => "Przywróć", diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php index a6031698e0..b7acc37697 100644 --- a/apps/files_versions/l10n/es.php +++ b/apps/files_versions/l10n/es.php @@ -3,7 +3,7 @@ $TRANSLATIONS = array( "Could not revert: %s" => "No se puede revertir: %s", "Versions" => "Revisiones", "Failed to revert {file} to revision {timestamp}." => "No se ha podido revertir {archivo} a revisión {timestamp}.", -"More versions..." => "Más...", +"More versions..." => "Más versiones...", "No other versions available" => "No hay otras versiones disponibles", "Restore" => "Recuperar" ); diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php index 537783e6c9..7f3df1bce4 100644 --- a/apps/files_versions/l10n/fr.php +++ b/apps/files_versions/l10n/fr.php @@ -2,6 +2,9 @@ $TRANSLATIONS = array( "Could not revert: %s" => "Impossible de restaurer %s", "Versions" => "Versions", +"Failed to revert {file} to revision {timestamp}." => "Échec du retour du fichier {file} à la révision {timestamp}.", +"More versions..." => "Plus de versions...", +"No other versions available" => "Aucune autre version disponible", "Restore" => "Restaurer" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php index e599427363..4f37d5177a 100644 --- a/apps/user_ldap/l10n/es.php +++ b/apps/user_ldap/l10n/es.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "Connection test failed" => "La prueba de conexión falló", "Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?", "Confirm Deletion" => "Confirmar eliminación", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "Advertencia: Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.", "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Advertencia: El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.", "Server configuration" => "Configuración del Servidor", "Add Server Configuration" => "Agregar configuracion del servidor", @@ -29,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Contraseña", "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.", "User Login Filter" => "Filtro de inicio de sesión de usuario", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"", "User List Filter" => "Lista de filtros de usuario", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define el filtro a aplicar, cuando se obtienen usuarios (sin comodines). Por ejemplo: \"objectClass=person\"", "Group Filter" => "Filtro de grupo", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define el filtro a aplicar, cuando se obtienen grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"", "Connection Settings" => "Configuración de conexión", "Configuration Active" => "Configuracion activa", "When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.", @@ -39,19 +43,23 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.", "Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)", "Disable Main Server" => "Deshabilitar servidor principal", +"Only connect to the replica server." => "Conectar sólo con el servidor de réplica.", "Use TLS" => "Usar TLS", "Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, Fallará.", "Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)", "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.", "Cache Time-To-Live" => "Cache TTL", "in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.", "Directory Settings" => "Configuracion de directorio", "User Display Name Field" => "Campo de nombre de usuario a mostrar", +"The LDAP attribute to use to generate the user's display name." => "El campo LDAP a usar para generar el nombre para mostrar del usuario.", "Base User Tree" => "Árbol base de usuario", "One User Base DN per line" => "Un DN Base de Usuario por línea", "User Search Attributes" => "Atributos de la busqueda de usuario", "Optional; one attribute per line" => "Opcional; un atributo por linea", "Group Display Name Field" => "Campo de nombre de grupo a mostrar", +"The LDAP attribute to use to generate the groups's display name." => "El campo LDAP a usar para generar el nombre para mostrar del grupo.", "Base Group Tree" => "Árbol base de grupo", "One Group Base DN per line" => "Un DN Base de Grupo por línea", "Group Search Attributes" => "Atributos de busqueda de grupo", @@ -64,10 +72,13 @@ $TRANSLATIONS = array( "User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.", "Internal Username" => "Nombre de usuario interno", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.", "Internal Username Attribute:" => "Atributo Nombre de usuario Interno:", "Override UUID detection" => "Sobrescribir la detección UUID", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.", "UUID Attribute:" => "Atributo UUID:", "Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.", "Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP", "Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP", "Test Configuration" => "Configuración de prueba", diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php index 0c7d3ad078..8b6027b81e 100644 --- a/apps/user_ldap/l10n/fr.php +++ b/apps/user_ldap/l10n/fr.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "Connection test failed" => "Test de connexion échoué", "Do you really want to delete the current Server Configuration?" => "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?", "Confirm Deletion" => "Confirmer la suppression", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "Avertissement : Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.", "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Attention : Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.", "Server configuration" => "Configuration du serveur", "Add Server Configuration" => "Ajouter une configuration du serveur", @@ -29,8 +30,11 @@ $TRANSLATIONS = array( "Password" => "Mot de passe", "For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.", "User Login Filter" => "Modèle d'authentification utilisateurs", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"", "User List Filter" => "Filtre d'utilisateurs", +"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Définit le filtre à appliquer lors de la récupération des utilisateurs. Exemple : \"objectClass=person\"", "Group Filter" => "Filtre de groupes", +"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Définit le filtre à appliquer lors de la récupération des groupes. Exemple : \"objectClass=posixGroup\"", "Connection Settings" => "Paramètres de connexion", "Configuration Active" => "Configuration active", "When unchecked, this configuration will be skipped." => "Lorsque non cochée, la configuration sera ignorée.", @@ -39,19 +43,23 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Fournir un serveur de backup optionnel. Il doit s'agir d'une réplique du serveur LDAP/AD principal.", "Backup (Replica) Port" => "Port du serveur de backup (réplique)", "Disable Main Server" => "Désactiver le serveur principal", +"Only connect to the replica server." => "Se connecter uniquement au serveur de replica.", "Use TLS" => "Utiliser TLS", "Do not use it additionally for LDAPS connections, it will fail." => "À ne pas utiliser pour les connexions LDAPS (cela échouera).", "Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)", "Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.", "Cache Time-To-Live" => "Durée de vie du cache", "in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.", "Directory Settings" => "Paramètres du répertoire", "User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur", +"The LDAP attribute to use to generate the user's display name." => "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché.", "Base User Tree" => "DN racine de l'arbre utilisateurs", "One User Base DN per line" => "Un DN racine utilisateur par ligne", "User Search Attributes" => "Recherche des attributs utilisateur", "Optional; one attribute per line" => "Optionnel, un attribut par ligne", "Group Display Name Field" => "Champ \"nom d'affichage\" du groupe", +"The LDAP attribute to use to generate the groups's display name." => "L'attribut LDAP utilisé pour générer le nom de groupe affiché.", "Base Group Tree" => "DN racine de l'arbre groupes", "One Group Base DN per line" => "Un DN racine groupe par ligne", "Group Search Attributes" => "Recherche des attributs du groupe", @@ -64,10 +72,13 @@ $TRANSLATIONS = array( "User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ", "Internal Username" => "Nom d'utilisateur interne", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.", "Internal Username Attribute:" => "Nom d'utilisateur interne:", "Override UUID detection" => "Surcharger la détection d'UUID", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.", "UUID Attribute:" => "Attribut UUID :", "Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.", "Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP", "Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP", "Test Configuration" => "Tester la configuration", diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php index cd8ec6659a..951aabe24a 100644 --- a/apps/user_webdavauth/l10n/es.php +++ b/apps/user_webdavauth/l10n/es.php @@ -1,7 +1,7 @@ "Autenticación de WevDAV", +"WebDAV Authentication" => "Autenticación mediante WevDAV", "Address: " => "Dirección:", -"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviará las credenciales de usuario a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas." +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php index 0130e35c81..b11e3d5a02 100644 --- a/apps/user_webdavauth/l10n/fr.php +++ b/apps/user_webdavauth/l10n/fr.php @@ -1,5 +1,6 @@ "Authentification WebDAV" +"Address: " => "Adresse :", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et tout autre valeur comme une authentification valide." ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/config/config.sample.php b/config/config.sample.php index 5f748438bc..0afad880c1 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -71,9 +71,6 @@ $CONFIG = array( /* Enable the help menu item in the settings */ "knowledgebaseenabled" => true, -/* URL to use for the help page, server should understand OCS */ -"knowledgebaseurl" => "http://api.apps.owncloud.com/v1", - /* Enable installing apps from the appstore */ "appstoreenabled" => true, @@ -214,4 +211,9 @@ $CONFIG = array( 'preview_libreoffice_path' => '/usr/bin/libreoffice', /* cl parameters for libreoffice / openoffice */ 'preview_office_cl_parameters' => '', + +// Extra SSL options to be used for configuration +'openssl' => array( + //'config' => '/absolute/location/of/openssl.cnf', +), ); diff --git a/core/css/apps.css b/core/css/apps.css index 445a3b9b59..5de146feb1 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -129,6 +129,7 @@ /* counter and actions */ #app-navigation .utils { position: absolute; + padding: 7px 7px 0 0; right: 0; top: 0; bottom: 0; diff --git a/core/js/js.js b/core/js/js.js index af4a6d6b33..1999ff73d2 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -431,9 +431,16 @@ OC.Notification={ OC.Breadcrumb={ container:null, - crumbs:[], show:function(dir, leafname, leaflink){ - OC.Breadcrumb.clear(); + if(!this.container){//default + this.container=$('#controls'); + } + this._show(this.container, dir, leafname, leaflink); + }, + _show:function(container, dir, leafname, leaflink){ + var self = this; + + this._clear(container); // show home + path in subdirectories if (dir && dir !== '/') { @@ -450,8 +457,7 @@ OC.Breadcrumb={ crumbImg.attr('src',OC.imagePath('core','places/home')); crumbLink.append(crumbImg); crumb.append(crumbLink); - OC.Breadcrumb.container.prepend(crumb); - OC.Breadcrumb.crumbs.push(crumb); + container.prepend(crumb); //add path parts var segments = dir.split('/'); @@ -460,20 +466,23 @@ OC.Breadcrumb={ if (name !== '') { pathurl = pathurl+'/'+name; var link = OC.linkTo('files','index.php')+'?dir='+encodeURIComponent(pathurl); - OC.Breadcrumb.push(name, link); + self._push(container, name, link); } }); } //add leafname if (leafname && leaflink) { - OC.Breadcrumb.push(leafname, leaflink); + this._push(container, leafname, leaflink); } }, push:function(name, link){ - if(!OC.Breadcrumb.container){//default - OC.Breadcrumb.container=$('#controls'); + if(!this.container){//default + this.container=$('#controls'); } + return this._push(OC.Breadcrumb.container, name, link); + }, + _push:function(container, name, link){ var crumb=$('

'); crumb.addClass('crumb').addClass('last'); @@ -482,30 +491,30 @@ OC.Breadcrumb={ crumbLink.text(name); crumb.append(crumbLink); - var existing=OC.Breadcrumb.container.find('div.crumb'); + var existing=container.find('div.crumb'); if(existing.length){ existing.removeClass('last'); existing.last().after(crumb); }else{ - OC.Breadcrumb.container.prepend(crumb); + container.prepend(crumb); } - OC.Breadcrumb.crumbs.push(crumb); return crumb; }, pop:function(){ - if(!OC.Breadcrumb.container){//default - OC.Breadcrumb.container=$('#controls'); + if(!this.container){//default + this.container=$('#controls'); } - OC.Breadcrumb.container.find('div.crumb').last().remove(); - OC.Breadcrumb.container.find('div.crumb').last().addClass('last'); - OC.Breadcrumb.crumbs.pop(); + this.container.find('div.crumb').last().remove(); + this.container.find('div.crumb').last().addClass('last'); }, clear:function(){ - if(!OC.Breadcrumb.container){//default - OC.Breadcrumb.container=$('#controls'); + if(!this.container){//default + this.container=$('#controls'); } - OC.Breadcrumb.container.find('div.crumb').remove(); - OC.Breadcrumb.crumbs=[]; + this._clear(this.container); + }, + _clear:function(container) { + container.find('div.crumb').remove(); } }; diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 4092b8d074..f184a1022b 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -77,7 +77,7 @@ var OCdialogs = { self.$filePicker = $tmpl.octemplate({ dialog_name: dialog_name, title: title - }).data('path', ''); + }).data('path', '').data('multiselect', multiselect).data('mimetype', mimetype_filter); if (modal === undefined) { modal = false; @@ -100,7 +100,7 @@ var OCdialogs = { self._handlePickerClick(event, $(this)); }); self._fillFilePicker(''); - }).data('multiselect', multiselect).data('mimetype',mimetype_filter); + }); // build buttons var functionToCall = function() { @@ -285,7 +285,11 @@ var OCdialogs = { filename: entry.name, date: OC.mtime2date(entry.mtime) }); - $li.find('img').attr('src', entry.mimetype_icon); + if (entry.mimetype === "httpd/unix-directory") { + $li.find('img').attr('src', OC.imagePath('core', 'filetypes/folder.png')); + } else { + $li.find('img').attr('src', OC.Router.generate('core_ajax_preview', {x:32, y:32, file:escapeHTML(dir+'/'+entry.name)}) ); + } self.$filelist.append($li); }); diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js index 6cc6b5a855..0d7f40c592 100644 --- a/core/js/oc-requesttoken.js +++ b/core/js/oc-requesttoken.js @@ -1,3 +1,4 @@ -$(document).bind('ajaxSend', function(elm, xhr, s) { +$(document).on('ajaxSend',function(elm, xhr, s) { xhr.setRequestHeader('requesttoken', oc_requesttoken); }); + diff --git a/core/js/placeholder.js b/core/js/placeholder.js index 16543541cb..d63730547d 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -34,23 +34,20 @@ * * Which will result in: * - *
T
+ *
T
* */ (function ($) { $.fn.placeholder = function(seed) { var hash = md5(seed), - maxRange = parseInt('ffffffffff', 16), - red = parseInt(hash.substr(0,10), 16) / maxRange * 256, - green = parseInt(hash.substr(10,10), 16) / maxRange * 256, - blue = parseInt(hash.substr(20,10), 16) / maxRange * 256, - rgb = [Math.floor(red), Math.floor(green), Math.floor(blue)], + maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16), + hue = parseInt(hash, 16) / maxRange * 256, height = this.height(); - this.css('background-color', 'rgb(' + rgb.join(',') + ')'); + this.css('background-color', 'hsl(' + hue + ', 90%, 65%)'); // CSS rules - this.css('color', 'rgb(255, 255, 255)'); + this.css('color', '#fff'); this.css('font-weight', 'bold'); this.css('text-align', 'center'); diff --git a/core/l10n/ca.php b/core/l10n/ca.php index a77924b121..7697349012 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s ha compartit »%s« amb tu", "group" => "grup", +"Turned on maintenance mode" => "Activat el mode de manteniment", +"Turned off maintenance mode" => "Desactivat el mode de manteniment", +"Updated database" => "Actualitzada la base de dades", +"Updating filecache, this may take really long..." => "Actualitzant la memòria de cau del fitxers, això pot trigar molt...", +"Updated filecache" => "Actualitzada la memòria de cau dels fitxers", +"... %d%% done ..." => "... %d%% fet ...", "Category type not provided." => "No s'ha especificat el tipus de categoria.", "No category to add?" => "No voleu afegir cap categoria?", "This category already exists: %s" => "Aquesta categoria ja existeix: %s", diff --git a/core/l10n/es.php b/core/l10n/es.php index 077f677e97..9e34e6f4ac 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -1,7 +1,13 @@ "%s compatido »%s« contigo", +"%s shared »%s« with you" => "%s ha compatido »%s« contigo", "group" => "grupo", +"Turned on maintenance mode" => "Modo mantenimiento activado", +"Turned off maintenance mode" => "Modo mantenimiento desactivado", +"Updated database" => "Base de datos actualizada", +"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar bastante tiempo...", +"Updated filecache" => "Caché de archivos actualizada", +"... %d%% done ..." => "... %d%% hecho ...", "Category type not provided." => "Tipo de categoría no proporcionado.", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: %s" => "Esta categoría ya existe: %s", @@ -30,17 +36,17 @@ $TRANSLATIONS = array( "November" => "Noviembre", "December" => "Diciembre", "Settings" => "Ajustes", -"seconds ago" => "hace segundos", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"seconds ago" => "segundos antes", +"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"), "today" => "hoy", "yesterday" => "ayer", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"), "last month" => "el mes pasado", -"_%n month ago_::_%n months ago_" => array("",""), -"months ago" => "hace meses", +"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), +"months ago" => "meses antes", "last year" => "el año pasado", -"years ago" => "hace años", +"years ago" => "años antes", "Choose" => "Seleccionar", "Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos", "Yes" => "Sí", @@ -49,12 +55,12 @@ $TRANSLATIONS = array( "The object type is not specified." => "El tipo de objeto no está especificado.", "Error" => "Error", "The app name is not specified." => "El nombre de la aplicación no está especificado.", -"The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!", +"The required file {file} is not installed!" => "¡El fichero {file} es necesario y no está instalado!", "Shared" => "Compartido", "Share" => "Compartir", -"Error while sharing" => "Error mientras comparte", -"Error while unsharing" => "Error mientras se deja de compartir", -"Error while changing permissions" => "Error mientras se cambia permisos", +"Error while sharing" => "Error al compartir", +"Error while unsharing" => "Error al dejar de compartir", +"Error while changing permissions" => "Error al cambiar permisos", "Shared with you and the group {group} by {owner}" => "Compartido contigo y el grupo {group} por {owner}", "Shared with you by {owner}" => "Compartido contigo por {owner}", "Share with" => "Compartir con", @@ -84,6 +90,7 @@ $TRANSLATIONS = array( "Email sent" => "Correo electrónico enviado", "The update was unsuccessful. Please report this issue to the ownCloud community." => "La actualización ha fracasado. Por favor, informe de este problema a la Comunidad de ownCloud.", "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", +"%s password reset" => "%s restablecer contraseña", "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}", "The link to reset your password has been sent to your email.
If you do not receive it within a reasonable amount of time, check your spam/junk folders.
If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico.
Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado.
Si no está allí, pregunte a su administrador local.", "Request failed!
Did you make sure your email/username was right?" => "La petición ha fallado!
¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?", @@ -101,9 +108,9 @@ $TRANSLATIONS = array( "Apps" => "Aplicaciones", "Admin" => "Administración", "Help" => "Ayuda", -"Access forbidden" => "Acceso prohibido", +"Access forbidden" => "Acceso denegado", "Cloud not found" => "No se encuentra la nube", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!", "Edit categories" => "Editar categorías", "Add" => "Agregar", "Security Warning" => "Advertencia de seguridad", @@ -127,13 +134,13 @@ $TRANSLATIONS = array( "%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.", "Log out" => "Salir", "Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!", -"If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!", +"If you did not change your password recently, your account may be compromised!" => "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!", "Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.", "Lost your password?" => "¿Ha perdido su contraseña?", "remember" => "recordar", "Log in" => "Entrar", "Alternative Logins" => "Inicios de sesión alternativos", -"Hey there,

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

Cheers!" => "Oye,

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

Disfrutalo!", +"Hey there,

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

Cheers!" => "Hey,

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

¡Un saludo!", "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 81fad25833..0f338a0934 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s partagé »%s« avec vous", "group" => "groupe", +"Turned on maintenance mode" => "Basculé en mode maintenance", +"Turned off maintenance mode" => "Basculé en mode production (non maintenance)", +"Updated database" => "Base de données mise à jour", +"Updating filecache, this may take really long..." => "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue...", +"Updated filecache" => "Cache de fichier mis à jour", +"... %d%% done ..." => "... %d%% effectué ...", "Category type not provided." => "Type de catégorie non spécifié.", "No category to add?" => "Pas de catégorie à ajouter ?", "This category already exists: %s" => "Cette catégorie existe déjà : %s", @@ -31,13 +37,13 @@ $TRANSLATIONS = array( "December" => "décembre", "Settings" => "Paramètres", "seconds ago" => "il y a quelques secondes", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("il y a %n minute","il y a %n minutes"), +"_%n hour ago_::_%n hours ago_" => array("Il y a %n heure","Il y a %n heures"), "today" => "aujourd'hui", "yesterday" => "hier", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("il y a %n jour","il y a %n jours"), "last month" => "le mois dernier", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"), "months ago" => "il y a plusieurs mois", "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", @@ -84,6 +90,7 @@ $TRANSLATIONS = array( "Email sent" => "Email envoyé", "The update was unsuccessful. Please report this issue to the ownCloud community." => "La mise à jour a échoué. Veuillez signaler ce problème à la communauté ownCloud.", "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.", +"%s password reset" => "Réinitialisation de votre mot de passe %s", "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}", "The link to reset your password has been sent to your email.
If you do not receive it within a reasonable amount of time, check your spam/junk folders.
If it is not there ask your local administrator ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.
Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.
Au besoin, contactez votre administrateur local.", "Request failed!
Did you make sure your email/username was right?" => "Requête en échec!
Avez-vous vérifié vos courriel/nom d'utilisateur?", @@ -108,9 +115,11 @@ $TRANSLATIONS = array( "Add" => "Ajouter", "Security Warning" => "Avertissement de sécurité", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner", +"For information how to properly configure your server, please see the documentation." => "Pour les informations de configuration de votre serveur, veuillez lire la documentation.", "Create an admin account" => "Créer un compte administrateur", "Advanced" => "Avancé", "Data folder" => "Répertoire des données", diff --git a/core/l10n/hi.php b/core/l10n/hi.php index 00cb5926d7..29e67f68ab 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -1,5 +1,15 @@ "कैटेगरी प्रकार उपलब्ध नहीं है", +"This category already exists: %s" => "यह कैटेगरी पहले से ही मौजूद है: %s", +"Object type not provided." => "ऑब्जेक्ट प्रकार नहीं दिया हुआ", +"Sunday" => "रविवार", +"Monday" => "सोमवार", +"Tuesday" => "मंगलवार", +"Wednesday" => "बुधवार", +"Thursday" => "बृहस्पतिवार", +"Friday" => "शुक्रवार", +"Saturday" => "शनिवार", "January" => "जनवरी", "February" => "फरवरी", "March" => "मार्च", @@ -21,6 +31,9 @@ $TRANSLATIONS = array( "Share" => "साझा करें", "Share with" => "के साथ साझा", "Password" => "पासवर्ड", +"Send" => "भेजें", +"Sending ..." => "भेजा जा रहा है", +"Email sent" => "ईमेल भेज दिया गया है ", "Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}", "You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|", "Username" => "प्रयोक्ता का नाम", @@ -31,6 +44,7 @@ $TRANSLATIONS = array( "Apps" => "Apps", "Help" => "सहयोग", "Cloud not found" => "क्लौड नहीं मिला ", +"Add" => "डाले", "Create an admin account" => "व्यवस्थापक खाता बनाएँ", "Advanced" => "उन्नत", "Data folder" => "डाटा फोल्डर", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 48f6dff618..2162de0e48 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s Współdzielone »%s« z tobą", "group" => "grupa", +"Turned on maintenance mode" => "Włączony tryb konserwacji", +"Turned off maintenance mode" => "Wyłączony tryb konserwacji", +"Updated database" => "Zaktualizuj bazę", +"Updating filecache, this may take really long..." => "Aktualizowanie filecache, to może potrwać bardzo długo...", +"Updated filecache" => "Zaktualizuj filecache", +"... %d%% done ..." => "... %d%% udane ...", "Category type not provided." => "Nie podano typu kategorii.", "No category to add?" => "Brak kategorii do dodania?", "This category already exists: %s" => "Ta kategoria już istnieje: %s", @@ -31,13 +37,13 @@ $TRANSLATIONS = array( "December" => "Grudzień", "Settings" => "Ustawienia", "seconds ago" => "sekund temu", -"_%n minute ago_::_%n minutes ago_" => array("","",""), -"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"), +"_%n hour ago_::_%n hours ago_" => array("%n godzine temu","%n godzin temu","%n godzin temu"), "today" => "dziś", "yesterday" => "wczoraj", -"_%n day ago_::_%n days ago_" => array("","",""), +"_%n day ago_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"), "last month" => "w zeszłym miesiącu", -"_%n month ago_::_%n months ago_" => array("","",""), +"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"), "months ago" => "miesięcy temu", "last year" => "w zeszłym roku", "years ago" => "lat temu", @@ -84,6 +90,7 @@ $TRANSLATIONS = array( "Email sent" => "E-mail wysłany", "The update was unsuccessful. Please report this issue to the ownCloud community." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem spoleczności ownCloud.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.", +"%s password reset" => "%s reset hasła", "Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}", "The link to reset your password has been sent to your email.
If you do not receive it within a reasonable amount of time, check your spam/junk folders.
If it is not there ask your local administrator ." => "Link do zresetowania hasła została wysłana na adres email.
Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem.
Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.", "Request failed!
Did you make sure your email/username was right?" => "Żądanie niepowiodło się!
Czy Twój email/nazwa użytkownika są poprawne?", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 8b6c261d64..267e07189c 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -2,6 +2,12 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu", "group" => "grup", +"Turned on maintenance mode" => "Bakım kipi etkinleştirildi", +"Turned off maintenance mode" => "Bakım kipi kapatıldı", +"Updated database" => "Veritabanı güncellendi", +"Updating filecache, this may take really long..." => "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir.", +"Updated filecache" => "Dosya önbelleği güncellendi", +"... %d%% done ..." => "%%%d tamamlandı ...", "Category type not provided." => "Kategori türü girilmedi.", "No category to add?" => "Eklenecek kategori yok?", "This category already exists: %s" => "Bu kategori zaten mevcut: %s", diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 74a5be2b96..f761e45d25 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -42,7 +42,7 @@ class OC_Core_LostPassword_Controller { } if (OC_User::userExists($_POST['user']) && $continue) { - $token = hash('sha256', OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', '')); + $token = hash('sha256', OC_Util::generateRandomBytes(30).OC_Config::getValue('passwordsalt', '')); OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', hash('sha256', $token)); // Hash the token again to prevent timing attacks $email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', ''); diff --git a/core/minimizer.php b/core/minimizer.php index 4da9037c41..eeeddf86a8 100644 --- a/core/minimizer.php +++ b/core/minimizer.php @@ -5,11 +5,11 @@ OC_App::loadApps(); if ($service == 'core.css') { $minimizer = new OC_Minimizer_CSS(); - $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles); + $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$coreStyles); $minimizer->output($files, $service); } else if ($service == 'core.js') { $minimizer = new OC_Minimizer_JS(); - $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts); + $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$coreScripts); $minimizer->output($files, $service); } diff --git a/core/setup.php b/core/setup.php index 40e30db533..4758c23b04 100644 --- a/core/setup.php +++ b/core/setup.php @@ -33,8 +33,8 @@ $opts = array( 'hasOracle' => $hasOracle, 'hasMSSQL' => $hasMSSQL, 'directory' => $datadir, - 'secureRNG' => OC_Util::secureRNG_available(), - 'htaccessWorking' => OC_Util::ishtaccessworking(), + 'secureRNG' => OC_Util::secureRNGAvailable(), + 'htaccessWorking' => OC_Util::isHtAccessWorking(), 'vulnerableToNullByte' => $vulnerableToNullByte, 'errors' => array(), ); diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 6585814d74..bdbf14d4d5 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 07:40+0000\n" +"Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,28 +30,28 @@ msgstr "grup" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Activat el mode de manteniment" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Desactivat el mode de manteniment" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Actualitzada la base de dades" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Actualitzant la memòria de cau del fitxers, això pot trigar molt..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Actualitzada la memòria de cau dels fitxers" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% fet ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -172,55 +172,55 @@ msgstr "Desembre" msgid "Settings" msgstr "Configuració" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "segons enrere" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "fa %n minut" msgstr[1] "fa %n minuts" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "fa %n hora" msgstr[1] "fa %n hores" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "avui" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ahir" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "fa %n dies" msgstr[1] "fa %n dies" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "el mes passat" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "fa %n mes" msgstr[1] "fa %n mesos" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "mesos enrere" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "l'any passat" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "anys enrere" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index ecc26a9b13..9dc1d5ffcc 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 07:40+0000\n" +"Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -171,7 +171,7 @@ msgstr[1] "%n fitxers" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} i {files}" #: js/filelist.js:563 msgid "Uploading %n file" diff --git a/l10n/es/core.po b/l10n/es/core.po index 4a006b413d..8532b677a0 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -8,6 +8,7 @@ # I Robot , 2013 # msoko , 2013 # pablomillaquen , 2013 +# Korrosivo , 2013 # saskarip , 2013 # saskarip , 2013 # iGerli , 2013 @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:40+0000\n" +"Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgstr "" #: ajax/share.php:97 #, php-format msgid "%s shared »%s« with you" -msgstr "%s compatido »%s« contigo" +msgstr "%s ha compatido »%s« contigo" #: ajax/share.php:227 msgid "group" @@ -37,28 +38,28 @@ msgstr "grupo" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Modo mantenimiento activado" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Modo mantenimiento desactivado" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Base de datos actualizada" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Actualizando caché de archivos, esto puede tardar bastante tiempo..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Caché de archivos actualizada" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% hecho ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -179,57 +180,57 @@ msgstr "Diciembre" msgid "Settings" msgstr "Ajustes" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" -msgstr "hace segundos" +msgstr "segundos antes" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n minuto" +msgstr[1] "Hace %n minutos" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n hora" +msgstr[1] "Hace %n horas" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "hoy" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "ayer" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n día" +msgstr[1] "Hace %n días" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "el mes pasado" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hace %n mes" +msgstr[1] "Hace %n meses" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" -msgstr "hace meses" +msgstr "meses antes" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "el año pasado" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" -msgstr "hace años" +msgstr "años antes" #: js/oc-dialogs.js:123 msgid "Choose" @@ -270,7 +271,7 @@ msgstr "El nombre de la aplicación no está especificado." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "¡El fichero requerido {file} no está instalado!" +msgstr "¡El fichero {file} es necesario y no está instalado!" #: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" @@ -282,15 +283,15 @@ msgstr "Compartir" #: js/share.js:131 js/share.js:683 msgid "Error while sharing" -msgstr "Error mientras comparte" +msgstr "Error al compartir" #: js/share.js:142 msgid "Error while unsharing" -msgstr "Error mientras se deja de compartir" +msgstr "Error al dejar de compartir" #: js/share.js:149 msgid "Error while changing permissions" -msgstr "Error mientras se cambia permisos" +msgstr "Error al cambiar permisos" #: js/share.js:158 msgid "Shared with you and the group {group} by {owner}" @@ -414,7 +415,7 @@ msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud #: lostpassword/controller.php:61 #, php-format msgid "%s password reset" -msgstr "" +msgstr "%s restablecer contraseña" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -494,7 +495,7 @@ msgstr "Ayuda" #: templates/403.php:12 msgid "Access forbidden" -msgstr "Acceso prohibido" +msgstr "Acceso denegado" #: templates/404.php:15 msgid "Cloud not found" @@ -509,7 +510,7 @@ msgid "" "View it: %s\n" "\n" "Cheers!" -msgstr "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!" +msgstr "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" @@ -621,7 +622,7 @@ msgstr "¡Inicio de sesión automático rechazado!" msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!" +msgstr "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!" #: templates/login.php:12 msgid "Please change your password to secure your account again." @@ -648,7 +649,7 @@ msgstr "Inicios de sesión alternativos" msgid "" "Hey there,

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

Cheers!" -msgstr "Oye,

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

Disfrutalo!" +msgstr "Hey,

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

¡Un saludo!" #: templates/update.php:3 #, php-format diff --git a/l10n/es/files.po b/l10n/es/files.po index 150143b933..5f5825ab79 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -7,14 +7,15 @@ # ggam , 2013 # mikelanabitarte , 2013 # qdneren , 2013 +# Korrosivo , 2013 # saskarip , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:10+0000\n" +"Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -164,23 +165,23 @@ msgstr "deshacer" msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n carpetas" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n archivos" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} y {files}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Subiendo %n archivo" +msgstr[1] "Subiendo %n archivos" #: js/filelist.js:628 msgid "files uploading" @@ -212,7 +213,7 @@ msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos." #: js/files.js:245 msgid "" diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po index 7d0a9ee023..e32866e301 100644 --- a/l10n/es/files_encryption.po +++ b/l10n/es/files_encryption.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:20+0000\n" +"Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,20 +68,20 @@ msgid "" "files." msgstr "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros." -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "Requisitos incompletos." -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada." -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Los siguientes usuarios no han sido configurados para el cifrado:" #: js/settings-admin.js:11 msgid "Saving..." diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po index 31ba6d42fa..42ee5e09a5 100644 --- a/l10n/es/files_sharing.po +++ b/l10n/es/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" -"Last-Translator: Art O. Pal \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:20+0000\n" +"Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +33,7 @@ msgstr "Enviar" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "Este enlace parece no funcionar más." +msgstr "Vaya, este enlace parece que no volverá a funcionar." #: templates/part.404.php:4 msgid "Reasons might be:" @@ -65,7 +65,7 @@ msgstr "%s compartió la carpeta %s contigo" msgid "%s shared the file %s with you" msgstr "%s compartió el fichero %s contigo" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Descargar" @@ -77,6 +77,6 @@ msgstr "Subir" msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "No hay vista previa disponible para" diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po index beb34a8115..2f439a315f 100644 --- a/l10n/es/files_trashbin.po +++ b/l10n/es/files_trashbin.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:16+0000\n" +"Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,43 +29,43 @@ msgstr "No se puede eliminar %s permanentemente" msgid "Couldn't restore %s" msgstr "No se puede restaurar %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "restaurar" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Error" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "eliminar archivo permanentemente" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Nombre" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Eliminado" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n carpeta" +msgstr[1] "%n carpetas" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n archivo" +msgstr[1] "%n archivos" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "recuperado" diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po index 2c3194d687..fa132a31fb 100644 --- a/l10n/es/files_versions.po +++ b/l10n/es/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # Rodrigo Rodríguez , 2013 +# Korrosivo , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-13 09:11-0400\n" -"PO-Revision-Date: 2013-08-13 05:50+0000\n" -"Last-Translator: Rodrigo Rodríguez \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:20+0000\n" +"Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,12 +34,12 @@ msgstr "No se ha podido revertir {archivo} a revisión {timestamp}." #: js/versions.js:79 msgid "More versions..." -msgstr "Más..." +msgstr "Más versiones..." #: js/versions.js:116 msgid "No other versions available" msgstr "No hay otras versiones disponibles" -#: js/versions.js:149 +#: js/versions.js:145 msgid "Restore" msgstr "Recuperar" diff --git a/l10n/es/lib.po b/l10n/es/lib.po index 43f652d3a5..832f5589c9 100644 --- a/l10n/es/lib.po +++ b/l10n/es/lib.po @@ -5,14 +5,15 @@ # Translators: # Dharth , 2013 # pablomillaquen , 2013 +# Korrosivo , 2013 # xhiena , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-31 23:40+0000\n" -"Last-Translator: Dharth \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:30+0000\n" +"Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -132,16 +133,16 @@ msgstr "La aplicación no se puede instalar porque contiene la etiqueta\n, 2013 # pablomillaquen , 2013 # qdneren , 2013 +# Korrosivo , 2013 # saskarip , 2013 # scambra , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-27 11:18-0400\n" -"PO-Revision-Date: 2013-08-26 08:01+0000\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 21:00+0000\n" "Last-Translator: eadeprado \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -35,7 +36,7 @@ msgstr "Error de autenticación" #: ajax/changedisplayname.php:31 msgid "Your display name has been changed." -msgstr "Su nombre fue cambiado." +msgstr "Su nombre de usuario ha sido cambiado." #: ajax/changedisplayname.php:34 msgid "Unable to change display name" @@ -91,53 +92,53 @@ msgstr "No se pudo eliminar al usuario del grupo %s" msgid "Couldn't update app." msgstr "No se pudo actualizar la aplicacion." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Actualizado a {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Desactivar" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activar" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Espere, por favor...." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Error mientras se desactivaba la aplicación" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Error mientras se activaba la aplicación" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Actualizando...." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Error mientras se actualizaba la aplicación" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Error" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Actualizar" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Actualizado" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo." #: js/personal.js:172 msgid "Saving..." @@ -199,7 +200,7 @@ msgid "" "configure your webserver in a way that the data directory is no longer " "accessible or you move the data directory outside the webserver document " "root." -msgstr "Su directorio de datos y sus archivos probablemente están accesibles desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web." +msgstr "Probablemente se puede acceder a su directorio de datos y sus archivos desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web." #: templates/admin.php:29 msgid "Setup Warning" @@ -218,13 +219,13 @@ msgstr "Por favor, vuelva a comprobar las guías de instalación-licensed by " -msgstr "-licenciado por " +msgstr "-licencia otorgada por " #: templates/help.php:4 msgid "User Documentation" @@ -414,7 +415,7 @@ msgstr "Obtener las aplicaciones para sincronizar sus archivos" #: templates/personal.php:19 msgid "Show First Run Wizard again" -msgstr "Mostrar asistente para iniciar otra vez" +msgstr "Mostrar asistente para iniciar de nuevo" #: templates/personal.php:27 #, php-format @@ -467,7 +468,7 @@ msgstr "Idioma" #: templates/personal.php:98 msgid "Help translate" -msgstr "Ayúdnos a traducir" +msgstr "Ayúdanos a traducir" #: templates/personal.php:104 msgid "WebDAV" @@ -486,15 +487,15 @@ msgstr "Cifrado" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "La aplicación de cifrado no está activada, descifre sus archivos" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Contraseña de acceso" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Descifrar archivos" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po index a823ac1574..3a30c965c3 100644 --- a/l10n/es/user_ldap.po +++ b/l10n/es/user_ldap.po @@ -6,14 +6,15 @@ # Agustin Ferrario , 2013 # ordenet , 2013 # Rodrigo Rodríguez , 2013 +# Korrosivo , 2013 # xhiena , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 17:10+0000\n" +"Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,7 +95,7 @@ msgid "" "Warning: Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behavior. Please ask your system administrator to " "disable one of them." -msgstr "" +msgstr "Advertencia: Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos." #: templates/settings.php:12 msgid "" @@ -159,7 +160,7 @@ msgstr "Filtro de inicio de sesión de usuario" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -msgstr "" +msgstr "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -169,7 +170,7 @@ msgstr "Lista de filtros de usuario" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "" +msgstr "Define el filtro a aplicar, cuando se obtienen usuarios (sin comodines). Por ejemplo: \"objectClass=person\"" #: templates/settings.php:59 msgid "Group Filter" @@ -179,7 +180,7 @@ msgstr "Filtro de grupo" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "" +msgstr "Define el filtro a aplicar, cuando se obtienen grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"" #: templates/settings.php:66 msgid "Connection Settings" @@ -217,7 +218,7 @@ msgstr "Deshabilitar servidor principal" #: templates/settings.php:72 msgid "Only connect to the replica server." -msgstr "" +msgstr "Conectar sólo con el servidor de réplica." #: templates/settings.php:73 msgid "Use TLS" @@ -240,7 +241,7 @@ msgstr "Apagar la validación por certificado SSL." msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s." #: templates/settings.php:76 msgid "Cache Time-To-Live" @@ -260,7 +261,7 @@ msgstr "Campo de nombre de usuario a mostrar" #: templates/settings.php:80 msgid "The LDAP attribute to use to generate the user's display name." -msgstr "" +msgstr "El campo LDAP a usar para generar el nombre para mostrar del usuario." #: templates/settings.php:81 msgid "Base User Tree" @@ -284,7 +285,7 @@ msgstr "Campo de nombre de grupo a mostrar" #: templates/settings.php:83 msgid "The LDAP attribute to use to generate the groups's display name." -msgstr "" +msgstr "El campo LDAP a usar para generar el nombre para mostrar del grupo." #: templates/settings.php:84 msgid "Base Group Tree" @@ -350,7 +351,7 @@ msgid "" "behavior as before ownCloud 5 enter the user display name attribute in the " "following field. Leave it empty for default behavior. Changes will have " "effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente." #: templates/settings.php:100 msgid "Internal Username Attribute:" @@ -369,7 +370,7 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behavior. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente." #: templates/settings.php:103 msgid "UUID Attribute:" @@ -391,7 +392,7 @@ msgid "" " is not configuration sensitive, it affects all LDAP configurations! Never " "clear the mappings in a production environment, only in a testing or " "experimental stage." -msgstr "" +msgstr "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental." #: templates/settings.php:106 msgid "Clear Username-LDAP User Mapping" diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po index b880f91c7a..a1d0cf3900 100644 --- a/l10n/es/user_webdavauth.po +++ b/l10n/es/user_webdavauth.po @@ -7,14 +7,15 @@ # Art O. Pal , 2012 # pggx999 , 2012 # Rodrigo Rodríguez , 2013 +# Korrosivo , 2013 # saskarip , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-13 09:11-0400\n" -"PO-Revision-Date: 2013-08-13 05:50+0000\n" -"Last-Translator: Rodrigo Rodríguez \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 18:30+0000\n" +"Last-Translator: Korrosivo \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "Autenticación de WevDAV" +msgstr "Autenticación mediante WevDAV" #: templates/settings.php:4 msgid "Address: " @@ -35,4 +36,4 @@ msgid "" "The user credentials will be sent to this address. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "onwCloud enviará las credenciales de usuario a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas." +msgstr "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas." diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index 79f5e340cf..de1769914c 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-04 05:50+0000\n" +"Last-Translator: pisike.sipelgas \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -171,7 +171,7 @@ msgstr[1] "%n faili" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} ja {files}" #: js/filelist.js:563 msgid "Uploading %n file" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index f5b034ae31..4215f9dc59 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 09:30+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,28 +33,28 @@ msgstr "groupe" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Basculé en mode maintenance" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Basculé en mode production (non maintenance)" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Base de données mise à jour" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Cache de fichier mis à jour" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% effectué ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -182,14 +182,14 @@ msgstr "il y a quelques secondes" #: js/js.js:813 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "il y a %n minute" +msgstr[1] "il y a %n minutes" #: js/js.js:814 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Il y a %n heure" +msgstr[1] "Il y a %n heures" #: js/js.js:815 msgid "today" @@ -202,8 +202,8 @@ msgstr "hier" #: js/js.js:817 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "il y a %n jour" +msgstr[1] "il y a %n jours" #: js/js.js:818 msgid "last month" @@ -212,8 +212,8 @@ msgstr "le mois dernier" #: js/js.js:819 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Il y a %n mois" +msgstr[1] "Il y a %n mois" #: js/js.js:820 msgid "months ago" @@ -410,7 +410,7 @@ msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud #: lostpassword/controller.php:61 #, php-format msgid "%s password reset" -msgstr "" +msgstr "Réinitialisation de votre mot de passe %s" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" @@ -527,7 +527,7 @@ msgstr "Votre version de PHP est vulnérable à l'attaque par caractère NULL (C #: templates/installation.php:26 #, php-format msgid "Please update your PHP installation to use %s securely." -msgstr "" +msgstr "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée." #: templates/installation.php:32 msgid "" @@ -552,7 +552,7 @@ msgstr "Votre répertoire data est certainement accessible depuis l'internet car msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Pour les informations de configuration de votre serveur, veuillez lire la documentation." #: templates/installation.php:47 msgid "Create an admin account" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index 245c7abab6..aca2838806 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"PO-Revision-Date: 2013-09-03 09:25+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -161,24 +161,24 @@ msgstr "annuler" #: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n dossier" +msgstr[1] "%n dossiers" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n fichier" +msgstr[1] "%n fichiers" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dir} et {files}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Téléversement de %n fichier" +msgstr[1] "Téléversement de %n fichiers" #: js/filelist.js:628 msgid "files uploading" @@ -210,7 +210,7 @@ msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers." #: js/files.js:245 msgid "" diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po index 174e4d3f3a..6616ed6227 100644 --- a/l10n/fr/files_encryption.po +++ b/l10n/fr/files_encryption.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"PO-Revision-Date: 2013-09-03 10:00+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,20 +65,20 @@ msgid "" "files." msgstr "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte." -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "Système minimum requis non respecté." -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée." -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" -msgstr "" +msgstr "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :" #: js/settings-admin.js:11 msgid "Saving..." diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po index c6eae4ea59..6f0ea28d9c 100644 --- a/l10n/fr/files_sharing.po +++ b/l10n/fr/files_sharing.po @@ -4,13 +4,14 @@ # # Translators: # square , 2013 +# Christophe Lherieau , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 18:23+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 11:10+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,27 +33,27 @@ msgstr "Envoyer" #: templates/part.404.php:3 msgid "Sorry, this link doesn’t seem to work anymore." -msgstr "" +msgstr "Désolé, mais le lien semble ne plus fonctionner." #: templates/part.404.php:4 msgid "Reasons might be:" -msgstr "" +msgstr "Les raisons peuvent être :" #: templates/part.404.php:6 msgid "the item was removed" -msgstr "" +msgstr "l'item a été supprimé" #: templates/part.404.php:7 msgid "the link expired" -msgstr "" +msgstr "le lien a expiré" #: templates/part.404.php:8 msgid "sharing is disabled" -msgstr "" +msgstr "le partage est désactivé" #: templates/part.404.php:10 msgid "For more info, please ask the person who sent this link." -msgstr "" +msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien." #: templates/public.php:15 #, php-format @@ -64,7 +65,7 @@ msgstr "%s a partagé le répertoire %s avec vous" msgid "%s shared the file %s with you" msgstr "%s a partagé le fichier %s avec vous" -#: templates/public.php:26 templates/public.php:88 +#: templates/public.php:26 templates/public.php:92 msgid "Download" msgstr "Télécharger" @@ -76,6 +77,6 @@ msgstr "Envoyer" msgid "Cancel upload" msgstr "Annuler l'envoi" -#: templates/public.php:85 +#: templates/public.php:89 msgid "No preview available for" msgstr "Pas d'aperçu disponible pour" diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po index 464c518b8a..5223811451 100644 --- a/l10n/fr/files_trashbin.po +++ b/l10n/fr/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 09:30+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,45 +28,45 @@ msgstr "Impossible d'effacer %s de façon permanente" msgid "Couldn't restore %s" msgstr "Impossible de restaurer %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "effectuer l'opération de restauration" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Erreur" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "effacer définitivement le fichier" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Supprimer de façon définitive" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Nom" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Effacé" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n dossiers" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -msgstr[1] "" +msgstr[1] "%n fichiers" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" -msgstr "" +msgstr "restauré" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po index 79799c762b..d5ea6a3308 100644 --- a/l10n/fr/files_versions.po +++ b/l10n/fr/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-28 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 06:10+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 11:10+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,16 +29,16 @@ msgstr "Versions" #: js/versions.js:53 msgid "Failed to revert {file} to revision {timestamp}." -msgstr "" +msgstr "Échec du retour du fichier {file} à la révision {timestamp}." #: js/versions.js:79 msgid "More versions..." -msgstr "" +msgstr "Plus de versions..." #: js/versions.js:116 msgid "No other versions available" -msgstr "" +msgstr "Aucune autre version disponible" -#: js/versions.js:149 +#: js/versions.js:145 msgid "Restore" msgstr "Restaurer" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index 5bd611ff26..376d8982c1 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2013 # Cyril Glapa , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 12:50+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +24,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Aucun nom d'application spécifié" #: app.php:361 msgid "Help" @@ -52,7 +53,7 @@ msgstr "Administration" #: app.php:837 #, php-format msgid "Failed to upgrade \"%s\"." -msgstr "" +msgstr "Echec de la mise à niveau \"%s\"." #: defaults.php:35 msgid "web services under your control" @@ -61,7 +62,7 @@ msgstr "services web sous votre contrôle" #: files.php:66 files.php:98 #, php-format msgid "cannot open \"%s\"" -msgstr "" +msgstr "impossible d'ouvrir \"%s\"" #: files.php:226 msgid "ZIP download is turned off." @@ -83,63 +84,63 @@ msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés. msgid "" "Download the files in smaller chunks, seperately or kindly ask your " "administrator." -msgstr "" +msgstr "Télécharger les fichiers en parties plus petites, séparément ou demander avec bienveillance à votre administrateur." #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Aucune source spécifiée pour installer l'application" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Aucun href spécifié pour installer l'application par http" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Aucun chemin spécifié pour installer l'application depuis un fichier local" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Les archives de type %s ne sont pas supportées" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Échec de l'ouverture de l'archive lors de l'installation de l'application" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "L'application ne fournit pas de fichier info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "L'application ne peut être installée car elle contient du code non-autorisé" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud" #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "L'application ne peut être installée car elle contient la balise true qui n'est pas autorisée pour les applications non-diffusées" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "L'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "Le dossier de l'application existe déjà" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s" #: json.php:28 msgid "Application is not enabled" @@ -265,57 +266,57 @@ msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la s msgid "Please double check the installation guides." msgstr "Veuillez vous référer au guide d'installation." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "il y a quelques secondes" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "il y a %n minutes" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "Il y a %n heures" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "aujourd'hui" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "hier" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "il y a %n jours" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "le mois dernier" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -msgstr[1] "" +msgstr[1] "Il y a %n mois" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "l'année dernière" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "il y a plusieurs années" #: template.php:297 msgid "Caused by:" -msgstr "" +msgstr "Causé par :" #: vcategories.php:188 vcategories.php:249 #, php-format diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index bd79bb2891..fd619afbb0 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:44-0400\n" +"PO-Revision-Date: 2013-09-03 09:50+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -88,53 +88,53 @@ msgstr "Impossible de supprimer l'utilisateur du groupe %s" msgid "Couldn't update app." msgstr "Impossible de mettre à jour l'application" -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Mettre à jour vers {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Désactiver" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Activer" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Veuillez patienter…" -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Erreur lors de la désactivation de l'application" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Erreur lors de l'activation de l'application" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Mise à jour..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Erreur lors de la mise à jour de l'application" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Erreur" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Mettre à jour" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Mise à jour effectuée avec succès" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "Déchiffrement en cours... Cela peut prendre un certain temps." #: js/personal.js:172 msgid "Saving..." @@ -196,7 +196,7 @@ msgid "" "configure your webserver in a way that the data directory is no longer " "accessible or you move the data directory outside the webserver document " "root." -msgstr "" +msgstr "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web." #: templates/admin.php:29 msgid "Setup Warning" @@ -211,7 +211,7 @@ msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la s #: templates/admin.php:33 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Veuillez consulter à nouveau les guides d'installation." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" @@ -233,7 +233,7 @@ msgid "" "System locale can't be set to %s. This means that there might be problems " "with certain characters in file names. We strongly suggest to install the " "required packages on your system to support %s." -msgstr "" +msgstr "Le localisation du système n'a pu être configurée à %s. Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est fortement recommandé d'installer les paquets requis pour le support de %s." #: templates/admin.php:75 msgid "Internet connection not working" @@ -246,7 +246,7 @@ msgid "" "installation of 3rd party apps don´t work. Accessing files from remote and " "sending of notification emails might also not work. We suggest to enable " "internet connection for this server if you want to have all features." -msgstr "" +msgstr "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes." #: templates/admin.php:92 msgid "Cron" @@ -260,11 +260,11 @@ msgstr "Exécute une tâche à chaque chargement de page" msgid "" "cron.php is registered at a webcron service to call cron.php once a minute " "over http." -msgstr "" +msgstr "cron.php est enregistré en tant que service webcron pour appeler cron.php une fois par minute via http." #: templates/admin.php:115 msgid "Use systems cron service to call the cron.php file once a minute." -msgstr "" +msgstr "Utilise le service cron du système pour appeler cron.php une fois par minute." #: templates/admin.php:120 msgid "Sharing" @@ -288,12 +288,12 @@ msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l' #: templates/admin.php:143 msgid "Allow public uploads" -msgstr "" +msgstr "Autoriser les téléversements publics" #: templates/admin.php:144 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur" #: templates/admin.php:152 msgid "Allow resharing" @@ -322,14 +322,14 @@ msgstr "Forcer HTTPS" #: templates/admin.php:185 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." -msgstr "" +msgstr "Forcer les clients à se connecter à %s via une connexion chiffrée." #: templates/admin.php:191 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." -msgstr "" +msgstr "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL." #: templates/admin.php:203 msgid "Log" @@ -483,15 +483,15 @@ msgstr "Chiffrement" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "L'application de chiffrement n'est plus activée, déchiffrez tous vos fichiers" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Mot de passe de connexion" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Déchiffrer tous les fichiers" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index 9729b2532b..4da048e30f 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christophe Lherieau , 2013 # plachance , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-19 15:06-0400\n" -"PO-Revision-Date: 2013-08-19 19:07+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 12:40+0000\n" +"Last-Translator: Christophe Lherieau \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91,7 +92,7 @@ msgid "" "Warning: Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behavior. Please ask your system administrator to " "disable one of them." -msgstr "" +msgstr "Avertissement : Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles." #: templates/settings.php:12 msgid "" @@ -156,7 +157,7 @@ msgstr "Modèle d'authentification utilisateurs" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action. Example: \"uid=%%uid\"" -msgstr "" +msgstr "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"" #: templates/settings.php:55 msgid "User List Filter" @@ -166,7 +167,7 @@ msgstr "Filtre d'utilisateurs" msgid "" "Defines the filter to apply, when retrieving users (no placeholders). " "Example: \"objectClass=person\"" -msgstr "" +msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs. Exemple : \"objectClass=person\"" #: templates/settings.php:59 msgid "Group Filter" @@ -176,7 +177,7 @@ msgstr "Filtre de groupes" msgid "" "Defines the filter to apply, when retrieving groups (no placeholders). " "Example: \"objectClass=posixGroup\"" -msgstr "" +msgstr "Définit le filtre à appliquer lors de la récupération des groupes. Exemple : \"objectClass=posixGroup\"" #: templates/settings.php:66 msgid "Connection Settings" @@ -214,7 +215,7 @@ msgstr "Désactiver le serveur principal" #: templates/settings.php:72 msgid "Only connect to the replica server." -msgstr "" +msgstr "Se connecter uniquement au serveur de replica." #: templates/settings.php:73 msgid "Use TLS" @@ -237,7 +238,7 @@ msgstr "Désactiver la validation du certificat SSL." msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s." #: templates/settings.php:76 msgid "Cache Time-To-Live" @@ -257,7 +258,7 @@ msgstr "Champ \"nom d'affichage\" de l'utilisateur" #: templates/settings.php:80 msgid "The LDAP attribute to use to generate the user's display name." -msgstr "" +msgstr "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché." #: templates/settings.php:81 msgid "Base User Tree" @@ -281,7 +282,7 @@ msgstr "Champ \"nom d'affichage\" du groupe" #: templates/settings.php:83 msgid "The LDAP attribute to use to generate the groups's display name." -msgstr "" +msgstr "L'attribut LDAP utilisé pour générer le nom de groupe affiché." #: templates/settings.php:84 msgid "Base Group Tree" @@ -347,7 +348,7 @@ msgid "" "behavior as before ownCloud 5 enter the user display name attribute in the " "following field. Leave it empty for default behavior. Changes will have " "effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP." #: templates/settings.php:100 msgid "Internal Username Attribute:" @@ -366,7 +367,7 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behavior. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP." #: templates/settings.php:103 msgid "UUID Attribute:" @@ -388,7 +389,7 @@ msgid "" " is not configuration sensitive, it affects all LDAP configurations! Never " "clear the mappings in a production environment, only in a testing or " "experimental stage." -msgstr "" +msgstr "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation." #: templates/settings.php:106 msgid "Clear Username-LDAP User Mapping" diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po index c4a85dce02..3766c1513c 100644 --- a/l10n/fr/user_webdavauth.po +++ b/l10n/fr/user_webdavauth.po @@ -5,7 +5,7 @@ # Translators: # Adalberto Rodrigues , 2013 # Christophe Lherieau , 2013 -# mishka , 2013 +# mishka, 2013 # ouafnico , 2012 # Robert Di Rosa <>, 2012 # Romain DEP. , 2012-2013 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-27 01:56-0400\n" -"PO-Revision-Date: 2013-07-27 05:57+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-04 11:00+0000\n" +"Last-Translator: yann_hellier \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,15 +25,15 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "Authentification WebDAV" +msgstr "" #: templates/settings.php:4 msgid "Address: " -msgstr "" +msgstr "Adresse :" #: templates/settings.php:7 msgid "" "The user credentials will be sent to this address. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et tout autre valeur comme une authentification valide." diff --git a/l10n/gl/files.po b/l10n/gl/files.po index 6de09cdb0f..3a9323639d 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-03 12:20+0000\n" +"Last-Translator: mbouzada \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -170,7 +170,7 @@ msgstr[1] "%n ficheiros" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} e {files}" #: js/filelist.js:563 msgid "Uploading %n file" diff --git a/l10n/hi/core.po b/l10n/hi/core.po index 479e61d7c6..dd5f832c46 100644 --- a/l10n/hi/core.po +++ b/l10n/hi/core.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Debanjum , 2013 # rktaiwala , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-30 13:33+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:43-0400\n" +"PO-Revision-Date: 2013-09-03 11:00+0000\n" +"Last-Translator: Debanjum \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +55,7 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "कैटेगरी प्रकार उपलब्ध नहीं है" #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -63,13 +64,13 @@ msgstr "" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "यह कैटेगरी पहले से ही मौजूद है: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "ऑब्जेक्ट प्रकार नहीं दिया हुआ" #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 @@ -93,31 +94,31 @@ msgstr "" #: js/config.php:32 msgid "Sunday" -msgstr "" +msgstr "रविवार" #: js/config.php:33 msgid "Monday" -msgstr "" +msgstr "सोमवार" #: js/config.php:34 msgid "Tuesday" -msgstr "" +msgstr "मंगलवार" #: js/config.php:35 msgid "Wednesday" -msgstr "" +msgstr "बुधवार" #: js/config.php:36 msgid "Thursday" -msgstr "" +msgstr "बृहस्पतिवार" #: js/config.php:37 msgid "Friday" -msgstr "" +msgstr "शुक्रवार" #: js/config.php:38 msgid "Saturday" -msgstr "" +msgstr "शनिवार" #: js/config.php:43 msgid "January" @@ -318,7 +319,7 @@ msgstr "" #: js/share.js:203 msgid "Send" -msgstr "" +msgstr "भेजें" #: js/share.js:208 msgid "Set expiration date" @@ -386,11 +387,11 @@ msgstr "" #: js/share.js:670 msgid "Sending ..." -msgstr "" +msgstr "भेजा जा रहा है" #: js/share.js:681 msgid "Email sent" -msgstr "" +msgstr "ईमेल भेज दिया गया है " #: js/update.js:17 msgid "" @@ -509,7 +510,7 @@ msgstr "" #: templates/edit_categories_dialog.php:16 msgid "Add" -msgstr "" +msgstr "डाले" #: templates/installation.php:24 templates/installation.php:31 #: templates/installation.php:38 diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po index 7f282b4ac5..b21350959c 100644 --- a/l10n/hu_HU/files_encryption.po +++ b/l10n/hu_HU/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# blackc0de , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 08:10-0400\n" -"PO-Revision-Date: 2013-08-19 19:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"PO-Revision-Date: 2013-09-01 19:30+0000\n" +"Last-Translator: blackc0de \n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Visszaállítási kulcs sikeresen kikapcsolva" #: ajax/adminrecovery.php:53 msgid "" @@ -37,11 +38,11 @@ msgstr "" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Jelszó sikeresen megváltoztatva." #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó." #: ajax/updatePrivateKeyPassword.php:51 msgid "Private key password successfully updated." @@ -61,18 +62,18 @@ msgid "" "files." msgstr "" -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." -msgstr "" +msgstr "Kérlek győződj meg arról, hogy PHP 5.3.3 vagy annál frissebb van telepítve, valamint a PHP-hez tartozó OpenSSL bővítmény be van-e kapcsolva és az helyesen van-e konfigurálva! Ki lett kapcsolva ideiglenesen a titkosító alkalmazás." -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" msgstr "" @@ -92,7 +93,7 @@ msgstr "" #: templates/invalid_private_key.php:7 msgid "personal settings" -msgstr "" +msgstr "személyes beállítások" #: templates/settings-admin.php:5 templates/settings-personal.php:4 msgid "Encryption" @@ -109,11 +110,11 @@ msgstr "" #: templates/settings-admin.php:21 templates/settings-personal.php:54 msgid "Enabled" -msgstr "" +msgstr "Bekapcsolva" #: templates/settings-admin.php:29 templates/settings-personal.php:62 msgid "Disabled" -msgstr "" +msgstr "Kikapcsolva" #: templates/settings-admin.php:34 msgid "Change recovery key password:" @@ -129,7 +130,7 @@ msgstr "" #: templates/settings-admin.php:53 msgid "Change Password" -msgstr "" +msgstr "Jelszó megváltoztatása" #: templates/settings-personal.php:11 msgid "Your private key password no longer match your log-in password:" @@ -147,19 +148,19 @@ msgstr "" #: templates/settings-personal.php:24 msgid "Old log-in password" -msgstr "" +msgstr "Régi bejelentkezési jelszó" #: templates/settings-personal.php:30 msgid "Current log-in password" -msgstr "" +msgstr "Jelenlegi bejelentkezési jelszó" #: templates/settings-personal.php:35 msgid "Update Private Key Password" -msgstr "" +msgstr "Privát kulcs jelszó frissítése" #: templates/settings-personal.php:45 msgid "Enable password recovery:" -msgstr "" +msgstr "Jelszó-visszaállítás bekapcsolása" #: templates/settings-personal.php:47 msgid "" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 6680a8ba6b..3aeb046dcc 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 10:00+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,28 +30,28 @@ msgstr "grupa" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Włączony tryb konserwacji" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Wyłączony tryb konserwacji" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Zaktualizuj bazę" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Aktualizowanie filecache, to może potrwać bardzo długo..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Zaktualizuj filecache" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "... %d%% udane ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -172,59 +172,59 @@ msgstr "Grudzień" msgid "Settings" msgstr "Ustawienia" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "sekund temu" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n minute temu" +msgstr[1] "%n minut temu" +msgstr[2] "%n minut temu" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n godzine temu" +msgstr[1] "%n godzin temu" +msgstr[2] "%n godzin temu" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "dziś" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "wczoraj" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n dzień temu" +msgstr[1] "%n dni temu" +msgstr[2] "%n dni temu" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "w zeszłym miesiącu" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n miesiąc temu" +msgstr[1] "%n miesięcy temu" +msgstr[2] "%n miesięcy temu" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "miesięcy temu" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "w zeszłym roku" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "lat temu" @@ -411,7 +411,7 @@ msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud." #: lostpassword/controller.php:61 #, php-format msgid "%s password reset" -msgstr "" +msgstr "%s reset hasła" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index 8bab0cf590..df1d1d2047 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -4,14 +4,15 @@ # # Translators: # Cyryl Sochacki , 2013 +# Mariusz Fik , 2013 # adbrand , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 09:20+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -160,27 +161,27 @@ msgstr "cofnij" #: js/filelist.js:424 js/filelist.js:490 js/files.js:581 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n katalog" +msgstr[1] "%n katalogi" +msgstr[2] "%n katalogów" #: js/filelist.js:425 js/filelist.js:491 js/files.js:587 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n plik" +msgstr[1] "%n pliki" +msgstr[2] "%n plików" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{katalogi} and {pliki}" #: js/filelist.js:563 msgid "Uploading %n file" msgid_plural "Uploading %n files" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Wysyłanie %n pliku" +msgstr[1] "Wysyłanie %n plików" +msgstr[2] "Wysyłanie %n plików" #: js/filelist.js:628 msgid "files uploading" @@ -212,7 +213,7 @@ msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki." #: js/files.js:245 msgid "" diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po index fd82c9bdd6..d06393b1c8 100644 --- a/l10n/pl/files_trashbin.po +++ b/l10n/pl/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-04 22:20+0000\n" "Last-Translator: I Robot \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -28,45 +28,45 @@ msgstr "Nie można trwale usunąć %s" msgid "Couldn't restore %s" msgstr "Nie można przywrócić %s" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "wykonywanie operacji przywracania" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" msgstr "Błąd" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "trwale usuń plik" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "Trwale usuń" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:184 templates/index.php:17 msgid "Name" msgstr "Nazwa" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:185 templates/index.php:27 msgid "Deleted" msgstr "Usunięte" -#: js/trash.js:191 +#: js/trash.js:193 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "%n katalogów" -#: js/trash.js:197 +#: js/trash.js:199 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -msgstr[2] "" +msgstr[2] "%n plików" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "przywrócony" diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po index d44b5a180f..0d7e4c4845 100644 --- a/l10n/pl/lib.po +++ b/l10n/pl/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 10:10+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +23,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Nie określono nazwy aplikacji" #: app.php:361 msgid "Help" @@ -87,59 +87,59 @@ msgstr "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administrato #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Nie określono źródła podczas instalacji aplikacji" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Nie określono linku skąd aplikacja ma być zainstalowana" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Nie określono lokalnego pliku z którego miała być instalowana aplikacja" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Typ archiwum %s nie jest obsługiwany" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Nie udało się otworzyć archiwum podczas instalacji aplikacji" #: installer.php:123 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Aplikacja nie posiada pliku info.xml" #: installer.php:129 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji" #: installer.php:138 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud" #: installer.php:144 msgid "" "App can't be installed because it contains the true tag " "which is not allowed for non shipped apps" -msgstr "" +msgstr "Aplikacja nie może być zainstalowana ponieważ true tag nie jest true , co nie jest dozwolone dla aplikacji nie wysłanych" #: installer.php:150 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" -msgstr "" +msgstr "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store" #: installer.php:160 msgid "App directory already exists" -msgstr "" +msgstr "Katalog aplikacji już isnieje" #: installer.php:173 #, php-format msgid "Can't create app folder. Please fix permissions. %s" -msgstr "" +msgstr "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s" #: json.php:28 msgid "Application is not enabled" @@ -265,55 +265,55 @@ msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożl msgid "Please double check the installation guides." msgstr "Sprawdź ponownie przewodniki instalacji." -#: template/functions.php:80 +#: template/functions.php:96 msgid "seconds ago" msgstr "sekund temu" -#: template/functions.php:81 +#: template/functions.php:97 msgid "%n minute ago" msgid_plural "%n minutes ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n minute temu" +msgstr[1] "%n minut temu" +msgstr[2] "%n minut temu" -#: template/functions.php:82 +#: template/functions.php:98 msgid "%n hour ago" msgid_plural "%n hours ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n godzinę temu" +msgstr[1] "%n godzin temu" +msgstr[2] "%n godzin temu" -#: template/functions.php:83 +#: template/functions.php:99 msgid "today" msgstr "dziś" -#: template/functions.php:84 +#: template/functions.php:100 msgid "yesterday" msgstr "wczoraj" -#: template/functions.php:85 +#: template/functions.php:101 msgid "%n day go" msgid_plural "%n days ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n dzień temu" +msgstr[1] "%n dni temu" +msgstr[2] "%n dni temu" -#: template/functions.php:86 +#: template/functions.php:102 msgid "last month" msgstr "w zeszłym miesiącu" -#: template/functions.php:87 +#: template/functions.php:103 msgid "%n month ago" msgid_plural "%n months ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%n miesiąc temu" +msgstr[1] "%n miesięcy temu" +msgstr[2] "%n miesięcy temu" -#: template/functions.php:88 +#: template/functions.php:104 msgid "last year" msgstr "w zeszłym roku" -#: template/functions.php:89 +#: template/functions.php:105 msgid "years ago" msgstr "lat temu" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index 13437f51c4..310e6c15fa 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-25 19:18-0400\n" -"PO-Revision-Date: 2013-08-25 23:18+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-05 10:10+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,53 +86,53 @@ msgstr "Nie można usunąć użytkownika z grupy %s" msgid "Couldn't update app." msgstr "Nie można uaktualnić aplikacji." -#: js/apps.js:35 +#: js/apps.js:43 msgid "Update to {appversion}" msgstr "Aktualizacja do {appversion}" -#: js/apps.js:41 js/apps.js:74 js/apps.js:100 +#: js/apps.js:49 js/apps.js:82 js/apps.js:108 msgid "Disable" msgstr "Wyłącz" -#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109 +#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117 msgid "Enable" msgstr "Włącz" -#: js/apps.js:63 +#: js/apps.js:71 msgid "Please wait...." msgstr "Proszę czekać..." -#: js/apps.js:71 js/apps.js:72 js/apps.js:92 +#: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Błąd podczas wyłączania aplikacji" -#: js/apps.js:91 js/apps.js:104 js/apps.js:105 +#: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Błąd podczas włączania aplikacji" -#: js/apps.js:115 +#: js/apps.js:123 msgid "Updating...." msgstr "Aktualizacja w toku..." -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error while updating app" msgstr "Błąd podczas aktualizacji aplikacji" -#: js/apps.js:118 +#: js/apps.js:126 msgid "Error" msgstr "Błąd" -#: js/apps.js:119 templates/apps.php:43 +#: js/apps.js:127 templates/apps.php:43 msgid "Update" msgstr "Aktualizuj" -#: js/apps.js:122 +#: js/apps.js:130 msgid "Updated" msgstr "Zaktualizowano" #: js/personal.js:150 msgid "Decrypting files... Please wait, this can take some time." -msgstr "" +msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas." #: js/personal.js:172 msgid "Saving..." @@ -194,7 +194,7 @@ msgid "" "configure your webserver in a way that the data directory is no longer " "accessible or you move the data directory outside the webserver document " "root." -msgstr "" +msgstr "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW." #: templates/admin.php:29 msgid "Setup Warning" @@ -231,7 +231,7 @@ msgid "" "System locale can't be set to %s. This means that there might be problems " "with certain characters in file names. We strongly suggest to install the " "required packages on your system to support %s." -msgstr "" +msgstr "System lokalny nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s." #: templates/admin.php:75 msgid "Internet connection not working" @@ -244,7 +244,7 @@ msgid "" "installation of 3rd party apps don´t work. Accessing files from remote and " "sending of notification emails might also not work. We suggest to enable " "internet connection for this server if you want to have all features." -msgstr "" +msgstr "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje." #: templates/admin.php:92 msgid "Cron" @@ -258,11 +258,11 @@ msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną" msgid "" "cron.php is registered at a webcron service to call cron.php once a minute " "over http." -msgstr "" +msgstr "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na minutę przez http." #: templates/admin.php:115 msgid "Use systems cron service to call the cron.php file once a minute." -msgstr "" +msgstr "Użyj systemowego cron-a do uruchamiania cron.php raz na minutę." #: templates/admin.php:120 msgid "Sharing" @@ -291,7 +291,7 @@ msgstr "Pozwól na publiczne wczytywanie" #: templates/admin.php:144 msgid "" "Allow users to enable others to upload into their publicly shared folders" -msgstr "" +msgstr "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów" #: templates/admin.php:152 msgid "Allow resharing" @@ -327,7 +327,7 @@ msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączeni msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." -msgstr "" +msgstr "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL." #: templates/admin.php:203 msgid "Log" @@ -473,7 +473,7 @@ msgstr "WebDAV" msgid "" "Use this address to access your Files via WebDAV" -msgstr "" +msgstr "Użyj tego adresu do dostępu do twoich plików przez WebDAV" #: templates/personal.php:117 msgid "Encryption" @@ -481,15 +481,15 @@ msgstr "Szyfrowanie" #: templates/personal.php:119 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik" #: templates/personal.php:125 msgid "Log-in password" -msgstr "" +msgstr "Hasło logowania" #: templates/personal.php:130 msgid "Decrypt all Files" -msgstr "" +msgstr "Odszyfruj wszystkie pliki" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 4397a9890b..53543fba7d 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-03 07:42-0400\n" +"PO-Revision-Date: 2013-09-02 15:40+0000\n" +"Last-Translator: Flávio Veras \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -172,7 +172,7 @@ msgstr[1] "" #: js/filelist.js:432 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} e {files}" #: js/filelist.js:563 msgid "Uploading %n file" @@ -210,7 +210,7 @@ msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)" msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos." #: js/files.js:245 msgid "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index f2f058e8d2..0405b8cabf 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -171,55 +171,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 7e2f79d267..edc1434fe7 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 0e11e6f04d..8ad9f8fe11 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -60,18 +60,18 @@ msgid "" "files." msgstr "" -#: hooks/hooks.php:41 +#: hooks/hooks.php:51 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:42 +#: hooks/hooks.php:52 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now, " "the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:249 +#: hooks/hooks.php:250 msgid "Following users are not set up for encryption:" msgstr "" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index c0de53d858..551a91905d 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index ba7bdaaa82..fe5a83d1b4 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index ca149fb14c..784a56543d 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 4c568ee555..b737c6b859 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 4d24c3c7a1..ce7cf69cfd 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 462831bc96..f6c3ec932b 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index a5d6146f1c..ab5d56dc2f 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 1e53a5a759..7010282b01 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index 3f86937276..c16793359c 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Fatih Aşıcı , 2013 # ismail yenigül , 2013 # tridinebandim, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-01 13:27-0400\n" -"PO-Revision-Date: 2013-08-30 13:50+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-05 07:36-0400\n" +"PO-Revision-Date: 2013-09-04 11:02+0000\n" +"Last-Translator: Fatih Aşıcı \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,28 +31,28 @@ msgstr "grup" #: ajax/update.php:11 msgid "Turned on maintenance mode" -msgstr "" +msgstr "Bakım kipi etkinleştirildi" #: ajax/update.php:14 msgid "Turned off maintenance mode" -msgstr "" +msgstr "Bakım kipi kapatıldı" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "Veritabanı güncellendi" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Dosya önbelleği güncellendi" #: ajax/update.php:26 #, php-format msgid "... %d%% done ..." -msgstr "" +msgstr "%%%d tamamlandı ..." #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -172,55 +173,55 @@ msgstr "Aralık" msgid "Settings" msgstr "Ayarlar" -#: js/js.js:812 +#: js/js.js:821 msgid "seconds ago" msgstr "saniye önce" -#: js/js.js:813 +#: js/js.js:822 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n dakika önce" msgstr[1] "%n dakika önce" -#: js/js.js:814 +#: js/js.js:823 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n saat önce" msgstr[1] "%n saat önce" -#: js/js.js:815 +#: js/js.js:824 msgid "today" msgstr "bugün" -#: js/js.js:816 +#: js/js.js:825 msgid "yesterday" msgstr "dün" -#: js/js.js:817 +#: js/js.js:826 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n gün önce" msgstr[1] "%n gün önce" -#: js/js.js:818 +#: js/js.js:827 msgid "last month" msgstr "geçen ay" -#: js/js.js:819 +#: js/js.js:828 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n ay önce" msgstr[1] "%n ay önce" -#: js/js.js:820 +#: js/js.js:829 msgid "months ago" msgstr "ay önce" -#: js/js.js:821 +#: js/js.js:830 msgid "last year" msgstr "geçen yıl" -#: js/js.js:822 +#: js/js.js:831 msgid "years ago" msgstr "yıl önce" diff --git a/lib/app.php b/lib/app.php index 8f5dd1d685..1a0a7e6f9a 100644 --- a/lib/app.php +++ b/lib/app.php @@ -73,11 +73,11 @@ class OC_App{ if (!defined('DEBUG') || !DEBUG) { if (is_null($types) - && empty(OC_Util::$core_scripts) - && empty(OC_Util::$core_styles)) { - OC_Util::$core_scripts = OC_Util::$scripts; + && empty(OC_Util::$coreScripts) + && empty(OC_Util::$coreStyles)) { + OC_Util::$coreScripts = OC_Util::$scripts; OC_Util::$scripts = array(); - OC_Util::$core_styles = OC_Util::$styles; + OC_Util::$coreStyles = OC_Util::$styles; OC_Util::$styles = array(); } } diff --git a/lib/base.php b/lib/base.php index b5c12a683f..fe160f7365 100644 --- a/lib/base.php +++ b/lib/base.php @@ -417,7 +417,7 @@ class OC { } self::initPaths(); - OC_Util::issetlocaleworking(); + OC_Util::isSetLocaleWorking(); // set debug mode if an xdebug session is active if (!defined('DEBUG') || !DEBUG) { @@ -529,7 +529,7 @@ class OC { } // write error into log if locale can't be set - if (OC_Util::issetlocaleworking() == false) { + if (OC_Util::isSetLocaleWorking() == false) { OC_Log::write('core', 'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system', OC_Log::ERROR); @@ -768,7 +768,7 @@ class OC { if (in_array($_COOKIE['oc_token'], $tokens, true)) { // replace successfully used token with a new one OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']); - $token = OC_Util::generate_random_bytes(32); + $token = OC_Util::generateRandomBytes(32); OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time()); OC_User::setMagicInCookie($_COOKIE['oc_username'], $token); // login @@ -808,7 +808,7 @@ class OC { if (defined("DEBUG") && DEBUG) { OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG); } - $token = OC_Util::generate_random_bytes(32); + $token = OC_Util::generateRandomBytes(32); OC_Preferences::setValue($userid, 'login_token', $token, time()); OC_User::setMagicInCookie($userid, $token); } else { diff --git a/lib/files/view.php b/lib/files/view.php index 8aee12bf6f..406354e233 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -268,18 +268,18 @@ class View { $absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path)); if (\OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data) and Filesystem::isValidPath($path) - and !Filesystem::isFileBlacklisted($path) + and !Filesystem::isFileBlacklisted($path) ) { $path = $this->getRelativePath($absolutePath); $exists = $this->file_exists($path); $run = true; - if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) { + if ($this->shouldEmitHooks($path)) { if (!$exists) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_create, array( - Filesystem::signal_param_path => $path, + Filesystem::signal_param_path => $this->getHookPath($path), Filesystem::signal_param_run => &$run ) ); @@ -288,7 +288,7 @@ class View { Filesystem::CLASSNAME, Filesystem::signal_write, array( - Filesystem::signal_param_path => $path, + Filesystem::signal_param_path => $this->getHookPath($path), Filesystem::signal_param_run => &$run ) ); @@ -301,18 +301,18 @@ class View { list ($count, $result) = \OC_Helper::streamCopy($data, $target); fclose($target); fclose($data); - if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path) && $result !== false) { + if ($this->shouldEmitHooks($path) && $result !== false) { if (!$exists) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_create, - array(Filesystem::signal_param_path => $path) + array(Filesystem::signal_param_path => $this->getHookPath($path)) ); } \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_write, - array(Filesystem::signal_param_path => $path) + array(Filesystem::signal_param_path => $this->getHookPath($path)) ); } \OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count); @@ -354,21 +354,21 @@ class View { return false; } $run = true; - if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) { + if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) { // if it was a rename from a part file to a regular file it was a write and not a rename operation \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_write, array( - Filesystem::signal_param_path => $path2, + Filesystem::signal_param_path => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); - } elseif ($this->fakeRoot == Filesystem::getRoot()) { + } elseif ($this->shouldEmitHooks()) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_rename, array( - Filesystem::signal_param_oldpath => $path1, - Filesystem::signal_param_newpath => $path2, + Filesystem::signal_param_oldpath => $this->getHookPath($path1), + Filesystem::signal_param_newpath => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); @@ -408,22 +408,22 @@ class View { } } } - if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) { + if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) { // if it was a rename from a part file to a regular file it was a write and not a rename operation \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_write, array( - Filesystem::signal_param_path => $path2, + Filesystem::signal_param_path => $this->getHookPath($path2), ) ); - } elseif ($this->fakeRoot == Filesystem::getRoot() && $result !== false) { + } elseif ($this->shouldEmitHooks() && $result !== false) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_rename, array( - Filesystem::signal_param_oldpath => $path1, - Filesystem::signal_param_newpath => $path2 + Filesystem::signal_param_oldpath => $this->getHookPath($path1), + Filesystem::signal_param_newpath => $this->getHookPath($path2) ) ); } @@ -455,13 +455,13 @@ class View { } $run = true; $exists = $this->file_exists($path2); - if ($this->fakeRoot == Filesystem::getRoot()) { + if ($this->shouldEmitHooks()) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_copy, array( - Filesystem::signal_param_oldpath => $path1, - Filesystem::signal_param_newpath => $path2, + Filesystem::signal_param_oldpath => $this->getHookPath($path1), + Filesystem::signal_param_newpath => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); @@ -470,7 +470,7 @@ class View { Filesystem::CLASSNAME, Filesystem::signal_create, array( - Filesystem::signal_param_path => $path2, + Filesystem::signal_param_path => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); @@ -480,7 +480,7 @@ class View { Filesystem::CLASSNAME, Filesystem::signal_write, array( - Filesystem::signal_param_path => $path2, + Filesystem::signal_param_path => $this->getHookPath($path2), Filesystem::signal_param_run => &$run ) ); @@ -511,26 +511,26 @@ class View { list($count, $result) = \OC_Helper::streamCopy($source, $target); } } - if ($this->fakeRoot == Filesystem::getRoot() && $result !== false) { + if ($this->shouldEmitHooks() && $result !== false) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_copy, array( - Filesystem::signal_param_oldpath => $path1, - Filesystem::signal_param_newpath => $path2 + Filesystem::signal_param_oldpath => $this->getHookPath($path1), + Filesystem::signal_param_newpath => $this->getHookPath($path2) ) ); if (!$exists) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_create, - array(Filesystem::signal_param_path => $path2) + array(Filesystem::signal_param_path => $this->getHookPath($path2)) ); } \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_write, - array(Filesystem::signal_param_path => $path2) + array(Filesystem::signal_param_path => $this->getHookPath($path2)) ); } return $result; @@ -621,11 +621,11 @@ class View { if ($path == null) { return false; } - if (Filesystem::$loaded && $this->fakeRoot == Filesystem::getRoot()) { + if ($this->shouldEmitHooks($path)) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_read, - array(Filesystem::signal_param_path => $path) + array(Filesystem::signal_param_path => $this->getHookPath($path)) ); } list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix); @@ -659,7 +659,7 @@ class View { $absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path)); if (\OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam) and Filesystem::isValidPath($path) - and !Filesystem::isFileBlacklisted($path) + and !Filesystem::isFileBlacklisted($path) ) { $path = $this->getRelativePath($absolutePath); if ($path == null) { @@ -675,7 +675,7 @@ class View { $result = $storage->$operation($internalPath); } $result = \OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result); - if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && $result !== false) { + if ($this->shouldEmitHooks($path) && $result !== false) { if ($operation != 'fopen') { //no post hooks for fopen, the file stream is still open $this->runHooks($hooks, $path, true); } @@ -686,10 +686,35 @@ class View { return null; } + /** + * get the path relative to the default root for hook usage + * + * @param string $path + * @return string + */ + private function getHookPath($path) { + if (!Filesystem::getView()) { + return $path; + } + return Filesystem::getView()->getRelativePath($this->getAbsolutePath($path)); + } + + private function shouldEmitHooks($path = '') { + if ($path && Cache\Scanner::isPartialFile($path)) { + return false; + } + if (!Filesystem::$loaded) { + return false; + } + $defaultRoot = Filesystem::getRoot(); + return (strlen($this->fakeRoot) >= strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot)) === $defaultRoot); + } + private function runHooks($hooks, $path, $post = false) { + $path = $this->getHookPath($path); $prefix = ($post) ? 'post_' : ''; $run = true; - if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) { + if ($this->shouldEmitHooks($path)) { foreach ($hooks as $hook) { if ($hook != 'read') { \OC_Hook::emit( diff --git a/lib/l10n/es.php b/lib/l10n/es.php index 7a82f8f6a1..bd13106237 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -24,6 +24,9 @@ $TRANSLATIONS = array( "App can't be installed because of not allowed code in the App" => "La aplicación no puede ser instalada por tener código no autorizado en la aplicación", "App can't be installed because it is not compatible with this version of ownCloud" => "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud", "App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "La aplicación no se puede instalar porque contiene la etiqueta\n\ntrue\n\nque no está permitida para aplicaciones no distribuidas", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store", +"App directory already exists" => "El directorio de la aplicación ya existe", +"Can't create app folder. Please fix permissions. %s" => "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s", "Application is not enabled" => "La aplicación no está habilitada", "Authentication error" => "Error de autenticación", "Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.", @@ -51,13 +54,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.", "Please double check the installation guides." => "Por favor, vuelva a comprobar las guías de instalación.", "seconds ago" => "hace segundos", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"), +"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"), "today" => "hoy", "yesterday" => "ayer", -"_%n day go_::_%n days ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"), "last month" => "mes pasado", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), "last year" => "año pasado", "years ago" => "hace años", "Caused by:" => "Causado por:", diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index cfcca28d5f..da3ec4ce37 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -1,15 +1,32 @@ "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud.", +"No app name specified" => "Aucun nom d'application spécifié", "Help" => "Aide", "Personal" => "Personnel", "Settings" => "Paramètres", "Users" => "Utilisateurs", "Admin" => "Administration", +"Failed to upgrade \"%s\"." => "Echec de la mise à niveau \"%s\".", "web services under your control" => "services web sous votre contrôle", +"cannot open \"%s\"" => "impossible d'ouvrir \"%s\"", "ZIP download is turned off." => "Téléchargement ZIP désactivé.", "Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.", "Back to Files" => "Retour aux Fichiers", "Selected files too large to generate zip file." => "Les fichiers sélectionnés sont trop volumineux pour être compressés.", +"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Télécharger les fichiers en parties plus petites, séparément ou demander avec bienveillance à votre administrateur.", +"No source specified when installing app" => "Aucune source spécifiée pour installer l'application", +"No href specified when installing app from http" => "Aucun href spécifié pour installer l'application par http", +"No path specified when installing app from local file" => "Aucun chemin spécifié pour installer l'application depuis un fichier local", +"Archives of type %s are not supported" => "Les archives de type %s ne sont pas supportées", +"Failed to open archive when installing app" => "Échec de l'ouverture de l'archive lors de l'installation de l'application", +"App does not provide an info.xml file" => "L'application ne fournit pas de fichier info.xml", +"App can't be installed because of not allowed code in the App" => "L'application ne peut être installée car elle contient du code non-autorisé", +"App can't be installed because it is not compatible with this version of ownCloud" => "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "L'application ne peut être installée car elle contient la balise true qui n'est pas autorisée pour les applications non-diffusées", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store", +"App directory already exists" => "Le dossier de l'application existe déjà", +"Can't create app folder. Please fix permissions. %s" => "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s", "Application is not enabled" => "L'application n'est pas activée", "Authentication error" => "Erreur d'authentification", "Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.", @@ -37,15 +54,16 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.", "Please double check the installation guides." => "Veuillez vous référer au guide d'installation.", "seconds ago" => "il y a quelques secondes", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("","il y a %n minutes"), +"_%n hour ago_::_%n hours ago_" => array("","Il y a %n heures"), "today" => "aujourd'hui", "yesterday" => "hier", -"_%n day go_::_%n days ago_" => array("",""), +"_%n day go_::_%n days ago_" => array("","il y a %n jours"), "last month" => "le mois dernier", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("","Il y a %n mois"), "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", +"Caused by:" => "Causé par :", "Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\"" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php index 984043aa0b..4acd735d69 100644 --- a/lib/l10n/pl.php +++ b/lib/l10n/pl.php @@ -1,5 +1,7 @@ "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud.", +"No app name specified" => "Nie określono nazwy aplikacji", "Help" => "Pomoc", "Personal" => "Osobiste", "Settings" => "Ustawienia", @@ -13,6 +15,18 @@ $TRANSLATIONS = array( "Back to Files" => "Wróć do plików", "Selected files too large to generate zip file." => "Wybrane pliki są zbyt duże, aby wygenerować plik zip.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administratora o zwiększenie limitu.", +"No source specified when installing app" => "Nie określono źródła podczas instalacji aplikacji", +"No href specified when installing app from http" => "Nie określono linku skąd aplikacja ma być zainstalowana", +"No path specified when installing app from local file" => "Nie określono lokalnego pliku z którego miała być instalowana aplikacja", +"Archives of type %s are not supported" => "Typ archiwum %s nie jest obsługiwany", +"Failed to open archive when installing app" => "Nie udało się otworzyć archiwum podczas instalacji aplikacji", +"App does not provide an info.xml file" => "Aplikacja nie posiada pliku info.xml", +"App can't be installed because of not allowed code in the App" => "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji", +"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud", +"App can't be installed because it contains the true tag which is not allowed for non shipped apps" => "Aplikacja nie może być zainstalowana ponieważ true tag nie jest true , co nie jest dozwolone dla aplikacji nie wysłanych", +"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store", +"App directory already exists" => "Katalog aplikacji już isnieje", +"Can't create app folder. Please fix permissions. %s" => "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s", "Application is not enabled" => "Aplikacja nie jest włączona", "Authentication error" => "Błąd uwierzytelniania", "Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.", @@ -40,13 +54,13 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.", "Please double check the installation guides." => "Sprawdź ponownie przewodniki instalacji.", "seconds ago" => "sekund temu", -"_%n minute ago_::_%n minutes ago_" => array("","",""), -"_%n hour ago_::_%n hours ago_" => array("","",""), +"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"), +"_%n hour ago_::_%n hours ago_" => array("%n godzinę temu","%n godzin temu","%n godzin temu"), "today" => "dziś", "yesterday" => "wczoraj", -"_%n day go_::_%n days ago_" => array("","",""), +"_%n day go_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"), "last month" => "w zeszłym miesiącu", -"_%n month ago_::_%n months ago_" => array("","",""), +"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"), "last year" => "w zeszłym roku", "years ago" => "lat temu", "Caused by:" => "Spowodowane przez:", diff --git a/lib/ocsclient.php b/lib/ocsclient.php index bd0302a2a8..58636f806b 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -40,16 +40,6 @@ class OC_OCSClient{ return($url); } - /** - * @brief Get the url of the OCS KB server. - * @returns string of the KB server - * This function returns the url of the OCS knowledge base server. It´s - * possible to set it in the config file or it will fallback to the default - */ - private static function getKBURL() { - $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1'); - return($url); - } /** * @brief Get the content of an OCS url call. @@ -214,44 +204,5 @@ class OC_OCSClient{ } - /** - * @brief Get all the knowledgebase entries from the OCS server - * @returns array with q and a data - * - * This function returns a list of all the knowledgebase entries from the OCS server - */ - public static function getKnownledgebaseEntries($page, $pagesize, $search='') { - $kbe = array('totalitems' => 0); - if(OC_Config::getValue('knowledgebaseenabled', true)) { - $p = (int) $page; - $s = (int) $pagesize; - $searchcmd = ''; - if ($search) { - $searchcmd = '&search='.urlencode($search); - } - $url = OC_OCSClient::getKBURL().'/knowledgebase/data?type=150&page='. $p .'&pagesize='. $s . $searchcmd; - $xml = OC_OCSClient::getOCSresponse($url); - $data = @simplexml_load_string($xml); - if($data===false) { - OC_Log::write('core', 'Unable to parse knowledgebase content', OC_Log::FATAL); - return null; - } - $tmp = $data->data->content; - for($i = 0; $i < count($tmp); $i++) { - $kbe[] = array( - 'id' => $tmp[$i]->id, - 'name' => $tmp[$i]->name, - 'description' => $tmp[$i]->description, - 'answer' => $tmp[$i]->answer, - 'preview1' => $tmp[$i]->smallpreviewpic1, - 'detailpage' => $tmp[$i]->detailpage - ); - } - $kbe['totalitems'] = $data->meta->totalitems; - } - return $kbe; - } - - } diff --git a/lib/public/share.php b/lib/public/share.php index 4461a1d421..3e91f19e22 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -513,7 +513,7 @@ class Share { if (isset($oldToken)) { $token = $oldToken; } else { - $token = \OC_Util::generate_random_bytes(self::TOKEN_LENGTH); + $token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH); } $result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, $token); diff --git a/lib/setup.php b/lib/setup.php index 05a4989097..6bf3c88370 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -61,7 +61,7 @@ class OC_Setup { } //generate a random salt that is used to salt the local user passwords - $salt = OC_Util::generate_random_bytes(30); + $salt = OC_Util::generateRandomBytes(30); OC_Config::setValue('passwordsalt', $salt); //write the config file diff --git a/lib/setup/mysql.php b/lib/setup/mysql.php index 0cf04fde5a..d97b6d2602 100644 --- a/lib/setup/mysql.php +++ b/lib/setup/mysql.php @@ -23,7 +23,7 @@ class MySQL extends AbstractDatabase { $this->dbuser=substr('oc_'.$username, 0, 16); if($this->dbuser!=$oldUser) { //hash the password so we don't need to store the admin config in the config file - $this->dbpassword=\OC_Util::generate_random_bytes(30); + $this->dbpassword=\OC_Util::generateRandomBytes(30); $this->createDBUser($connection); diff --git a/lib/setup/oci.php b/lib/setup/oci.php index 86b53de45a..326d7a0053 100644 --- a/lib/setup/oci.php +++ b/lib/setup/oci.php @@ -65,7 +65,7 @@ class OCI extends AbstractDatabase { //add prefix to the oracle user name to prevent collisions $this->dbuser='oc_'.$username; //create a new password so we don't need to store the admin config in the config file - $this->dbpassword=\OC_Util::generate_random_bytes(30); + $this->dbpassword=\OC_Util::generateRandomBytes(30); //oracle passwords are treated as identifiers: // must start with aphanumeric char diff --git a/lib/setup/postgresql.php b/lib/setup/postgresql.php index 49fcbf0326..89d328ada1 100644 --- a/lib/setup/postgresql.php +++ b/lib/setup/postgresql.php @@ -33,7 +33,7 @@ class PostgreSQL extends AbstractDatabase { //add prefix to the postgresql user name to prevent collisions $this->dbuser='oc_'.$username; //create a new password so we don't need to store the admin config in the config file - $this->dbpassword=\OC_Util::generate_random_bytes(30); + $this->dbpassword=\OC_Util::generateRandomBytes(30); $this->createDBUser($connection); diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 0024c9d496..0b868a39e4 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -58,7 +58,7 @@ class OC_TemplateLayout extends OC_Template { if (OC_Config::getValue('installed', false) && $renderas!='error') { $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter); } - if (!empty(OC_Util::$core_scripts)) { + if (!empty(OC_Util::$coreScripts)) { $this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter); } foreach($jsfiles as $info) { @@ -71,7 +71,7 @@ class OC_TemplateLayout extends OC_Template { // Add the css files $cssfiles = self::findStylesheetFiles(OC_Util::$styles); $this->assign('cssfiles', array()); - if (!empty(OC_Util::$core_styles)) { + if (!empty(OC_Util::$coreStyles)) { $this->append( 'cssfiles', OC_Helper::linkToRemoteBase('core.css', false) . $versionParameter); } foreach($cssfiles as $info) { diff --git a/lib/user.php b/lib/user.php index 93c7c9d4cd..0f6f40aec9 100644 --- a/lib/user.php +++ b/lib/user.php @@ -353,7 +353,7 @@ class OC_User { * generates a password */ public static function generatePassword() { - return OC_Util::generate_random_bytes(30); + return OC_Util::generateRandomBytes(30); } /** diff --git a/lib/util.php b/lib/util.php index 6f856b2201..de57f75d86 100755 --- a/lib/util.php +++ b/lib/util.php @@ -11,12 +11,18 @@ class OC_Util { public static $headers=array(); private static $rootMounted=false; private static $fsSetup=false; - public static $core_styles=array(); - public static $core_scripts=array(); + public static $coreStyles=array(); + public static $coreScripts=array(); - // Can be set up - public static function setupFS( $user = '' ) {// configure the initial filesystem based on the configuration - if(self::$fsSetup) {//setting up the filesystem twice can only lead to trouble + /** + * @brief Can be set up + * @param string $user + * @return boolean + * @description configure the initial filesystem based on the configuration + */ + public static function setupFS( $user = '' ) { + //setting up the filesystem twice can only lead to trouble + if(self::$fsSetup) { return false; } @@ -37,15 +43,16 @@ class OC_Util { self::$fsSetup=true; } - $CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ); + $configDataDirectory = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ); //first set up the local "root" storage \OC\Files\Filesystem::initMounts(); if(!self::$rootMounted) { - \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/'); - self::$rootMounted=true; + \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$configDataDirectory), '/'); + self::$rootMounted = true; } - if( $user != "" ) { //if we aren't logged in, there is no use to set up the filesystem + //if we aren't logged in, there is no use to set up the filesystem + if( $user != "" ) { $quota = self::getUserQuota($user); if ($quota !== \OC\Files\SPACE_UNLIMITED) { \OC\Files\Filesystem::addStorageWrapper(function($mountPoint, $storage) use ($quota, $user) { @@ -56,19 +63,19 @@ class OC_Util { } }); } - $user_dir = '/'.$user.'/files'; - $user_root = OC_User::getHome($user); - $userdirectory = $user_root . '/files'; - if( !is_dir( $userdirectory )) { - mkdir( $userdirectory, 0755, true ); + $userDir = '/'.$user.'/files'; + $userRoot = OC_User::getHome($user); + $userDirectory = $userRoot . '/files'; + if( !is_dir( $userDirectory )) { + mkdir( $userDirectory, 0755, true ); } //jail the user into his "home" directory - \OC\Files\Filesystem::init($user, $user_dir); + \OC\Files\Filesystem::init($user, $userDir); $fileOperationProxy = new OC_FileProxy_FileOperations(); OC_FileProxy::register($fileOperationProxy); - OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir)); + OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir)); } return true; } @@ -85,24 +92,27 @@ class OC_Util { } } + /** + * @return void + */ public static function tearDownFS() { \OC\Files\Filesystem::tearDown(); self::$fsSetup=false; - self::$rootMounted=false; + self::$rootMounted=false; } /** - * get the current installed version of ownCloud + * @brief get the current installed version of ownCloud * @return array */ public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(5, 80, 07); + return array(5, 80, 08); } /** - * get the current installed version string of ownCloud + * @brief get the current installed version string of ownCloud * @return string */ public static function getVersionString() { @@ -110,7 +120,7 @@ class OC_Util { } /** - * get the current installed edition of ownCloud. There is the community + * @description get the current installed edition of ownCloud. There is the community * edition that just returns an empty string and the enterprise edition * that returns "Enterprise". * @return string @@ -120,103 +130,117 @@ class OC_Util { } /** - * add a javascript file + * @brief add a javascript file * - * @param appid $application - * @param filename $file + * @param string $application + * @param filename $file + * @return void */ public static function addScript( $application, $file = null ) { - if( is_null( $file )) { + if ( is_null( $file )) { $file = $application; $application = ""; } - if( !empty( $application )) { + if ( !empty( $application )) { self::$scripts[] = "$application/js/$file"; - }else{ + } else { self::$scripts[] = "js/$file"; } } /** - * add a css file + * @brief add a css file * - * @param appid $application - * @param filename $file + * @param string $application + * @param filename $file + * @return void */ public static function addStyle( $application, $file = null ) { - if( is_null( $file )) { + if ( is_null( $file )) { $file = $application; $application = ""; } - if( !empty( $application )) { + if ( !empty( $application )) { self::$styles[] = "$application/css/$file"; - }else{ + } else { self::$styles[] = "css/$file"; } } /** * @brief Add a custom element to the header - * @param string tag tag name of the element + * @param string $tag tag name of the element * @param array $attributes array of attributes for the element * @param string $text the text content for the element + * @return void */ public static function addHeader( $tag, $attributes, $text='') { - self::$headers[] = array('tag'=>$tag, 'attributes'=>$attributes, 'text'=>$text); + self::$headers[] = array( + 'tag'=>$tag, + 'attributes'=>$attributes, + 'text'=>$text + ); } /** - * formats a timestamp in the "right" way + * @brief formats a timestamp in the "right" way * - * @param int timestamp $timestamp - * @param bool dateOnly option to omit time from the result + * @param int $timestamp + * @param bool $dateOnly option to omit time from the result + * @return string timestamp + * @description adjust to clients timezone if we know it */ public static function formatDate( $timestamp, $dateOnly=false) { - if(\OC::$session->exists('timezone')) {//adjust to clients timezone if we know it + if(\OC::$session->exists('timezone')) { $systemTimeZone = intval(date('O')); - $systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100); - $clientTimeZone=\OC::$session->get('timezone')*60; - $offset=$clientTimeZone-$systemTimeZone; - $timestamp=$timestamp+$offset*60; + $systemTimeZone = (round($systemTimeZone/100, 0)*60) + ($systemTimeZone%100); + $clientTimeZone = \OC::$session->get('timezone')*60; + $offset = $clientTimeZone - $systemTimeZone; + $timestamp = $timestamp + $offset*60; } - $l=OC_L10N::get('lib'); + $l = OC_L10N::get('lib'); return $l->l($dateOnly ? 'date' : 'datetime', $timestamp); } /** - * check if the current server configuration is suitable for ownCloud + * @brief check if the current server configuration is suitable for ownCloud * @return array arrays with error messages and hints */ public static function checkServer() { // Assume that if checkServer() succeeded before in this session, then all is fine. - if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) + if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) { return array(); + } - $errors=array(); + $errors = array(); $defaults = new \OC_Defaults(); - $web_server_restart= false; + $webServerRestart = false; //check for database drivers if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect') and !is_callable('oci_connect')) { - $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.', - 'hint'=>'');//TODO: sane hint - $web_server_restart= true; + $errors[] = array( + 'error'=>'No database drivers (sqlite, mysql, or postgresql) installed.', + 'hint'=>'' //TODO: sane hint + ); + $webServerRestart = true; } - //common hint for all file permissons error messages + //common hint for all file permissions error messages $permissionsHint = 'Permissions can usually be fixed by ' - .'giving the webserver write access to the root directory.'; + .'giving the webserver write access to the root directory.'; // Check if config folder is writable. if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) { $errors[] = array( 'error' => "Can't write into config directory", 'hint' => 'This can usually be fixed by ' - .'giving the webserver write access to the config directory.' + .'giving the webserver write access to the config directory.' ); } @@ -228,7 +252,8 @@ class OC_Util { $errors[] = array( 'error' => "Can't write into apps directory", 'hint' => 'This can usually be fixed by ' - .'giving the webserver write access to the apps directory ' + .'giving the webserver write access to the apps directory ' .'or disabling the appstore in the config file.' ); } @@ -243,94 +268,131 @@ class OC_Util { $errors[] = array( 'error' => "Can't create data directory (".$CONFIG_DATADIRECTORY.")", 'hint' => 'This can usually be fixed by ' - .'giving the webserver write access to the root directory.' + .'giving the webserver write access to the root directory.' ); } } else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) { - $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud', - 'hint'=>$permissionsHint); + $errors[] = array( + 'error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud', + 'hint'=>$permissionsHint + ); } else { $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY)); } + + $moduleHint = "Please ask your server administrator to install the module."; // check if all required php modules are present if(!class_exists('ZipArchive')) { - $errors[]=array('error'=>'PHP module zip not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module zip not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!class_exists('DOMDocument')) { - $errors[] = array('error' => 'PHP module dom not installed.', - 'hint' => 'Please ask your server administrator to install the module.'); - $web_server_restart =true; + $errors[] = array( + 'error' => 'PHP module dom not installed.', + 'hint' => $moduleHint + ); + $webServerRestart =true; } if(!function_exists('xml_parser_create')) { - $errors[] = array('error' => 'PHP module libxml not installed.', - 'hint' => 'Please ask your server administrator to install the module.'); - $web_server_restart =true; + $errors[] = array( + 'error' => 'PHP module libxml not installed.', + 'hint' => $moduleHint + ); + $webServerRestart = true; } if(!function_exists('mb_detect_encoding')) { - $errors[]=array('error'=>'PHP module mb multibyte not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module mb multibyte not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('ctype_digit')) { - $errors[]=array('error'=>'PHP module ctype is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module ctype is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('json_encode')) { - $errors[]=array('error'=>'PHP module JSON is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module JSON is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!extension_loaded('gd') || !function_exists('gd_info')) { - $errors[]=array('error'=>'PHP module GD is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module GD is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('gzencode')) { - $errors[]=array('error'=>'PHP module zlib is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module zlib is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('iconv')) { - $errors[]=array('error'=>'PHP module iconv is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module iconv is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if(!function_exists('simplexml_load_string')) { - $errors[]=array('error'=>'PHP module SimpleXML is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP module SimpleXML is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } - if(floatval(phpversion())<5.3) { - $errors[]=array('error'=>'PHP 5.3 is required.', + if(floatval(phpversion()) < 5.3) { + $errors[] = array( + 'error'=>'PHP 5.3 is required.', 'hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher.' - .' PHP 5.2 is no longer supported by ownCloud and the PHP community.'); - $web_server_restart=true; + .' PHP 5.2 is no longer supported by ownCloud and the PHP community.' + ); + $webServerRestart = true; } if(!defined('PDO::ATTR_DRIVER_NAME')) { - $errors[]=array('error'=>'PHP PDO module is not installed.', - 'hint'=>'Please ask your server administrator to install the module.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP PDO module is not installed.', + 'hint'=>$moduleHint + ); + $webServerRestart = true; } if (((strtolower(@ini_get('safe_mode')) == 'on') || (strtolower(@ini_get('safe_mode')) == 'yes') || (strtolower(@ini_get('safe_mode')) == 'true') || (ini_get("safe_mode") == 1 ))) { - $errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.', - 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.', + 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. ' + .'Please ask your server administrator to disable it in php.ini or in your webserver config.' + ); + $webServerRestart = true; } if (get_magic_quotes_gpc() == 1 ) { - $errors[]=array('error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.', - 'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.'); - $web_server_restart=true; + $errors[] = array( + 'error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.', + 'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. ' + .'Please ask your server administrator to disable it in php.ini or in your webserver config.' + ); + $webServerRestart = true; } - if($web_server_restart) { - $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?', - 'hint'=>'Please ask your server administrator to restart the web server.'); + if($webServerRestart) { + $errors[] = array( + 'error'=>'PHP modules have been installed, but they are still listed as missing?', + 'hint'=>'Please ask your server administrator to restart the web server.' + ); } // Cache the result of this function @@ -357,30 +419,36 @@ class OC_Util { } /** - * Check for correct file permissions of data directory - * @return array arrays with error messages and hints - */ + * @brief Check for correct file permissions of data directory + * @paran string $dataDirectory + * @return array arrays with error messages and hints + */ public static function checkDataDirectoryPermissions($dataDirectory) { $errors = array(); - if (stristr(PHP_OS, 'WIN')) { + if (self::runningOnWindows()) { //TODO: permissions checks for windows hosts } else { $permissionsModHint = 'Please change the permissions to 0770 so that the directory' .' cannot be listed by other users.'; - $prems = substr(decoct(@fileperms($dataDirectory)), -3); - if (substr($prems, -1) != '0') { + $perms = substr(decoct(@fileperms($dataDirectory)), -3); + if (substr($perms, -1) != '0') { OC_Helper::chmodr($dataDirectory, 0770); clearstatcache(); - $prems = substr(decoct(@fileperms($dataDirectory)), -3); - if (substr($prems, 2, 1) != '0') { - $errors[] = array('error' => 'Data directory ('.$dataDirectory.') is readable for other users', - 'hint' => $permissionsModHint); + $perms = substr(decoct(@fileperms($dataDirectory)), -3); + if (substr($perms, 2, 1) != '0') { + $errors[] = array( + 'error' => 'Data directory ('.$dataDirectory.') is readable for other users', + 'hint' => $permissionsModHint + ); } } } return $errors; } + /** + * @return void + */ public static function displayLoginPage($errors = array()) { $parameters = array(); foreach( $errors as $key => $value ) { @@ -394,8 +462,8 @@ class OC_Util { $parameters['user_autofocus'] = true; } if (isset($_REQUEST['redirect_url'])) { - $redirect_url = $_REQUEST['redirect_url']; - $parameters['redirect_url'] = urlencode($redirect_url); + $redirectUrl = $_REQUEST['redirect_url']; + $parameters['redirect_url'] = urlencode($redirectUrl); } $parameters['alt_login'] = OC_App::getAlternativeLogIns(); @@ -404,7 +472,8 @@ class OC_Util { /** - * Check if the app is enabled, redirects to home if not + * @brief Check if the app is enabled, redirects to home if not + * @return void */ public static function checkAppEnabled($app) { if( !OC_App::isEnabled($app)) { @@ -416,18 +485,21 @@ class OC_Util { /** * Check if the user is logged in, redirects to home if not. With * redirect URL parameter to the request URI. + * @return void */ public static function checkLoggedIn() { // Check if we are a user if( !OC_User::isLoggedIn()) { header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', - array('redirect_url' => OC_Request::requestUri()))); + array('redirectUrl' => OC_Request::requestUri()) + )); exit(); } } /** - * Check if the user is a admin, redirects to home if not + * @brief Check if the user is a admin, redirects to home if not + * @return void */ public static function checkAdminUser() { if( !OC_User::isAdminUser(OC_User::getUser())) { @@ -437,7 +509,7 @@ class OC_Util { } /** - * Check if the user is a subadmin, redirects to home if not + * @brief Check if the user is a subadmin, redirects to home if not * @return array $groups where the current user is subadmin */ public static function checkSubAdminUser() { @@ -449,7 +521,8 @@ class OC_Util { } /** - * Redirect to the user default page + * @brief Redirect to the user default page + * @return void */ public static function redirectToDefaultPage() { if(isset($_REQUEST['redirect_url'])) { @@ -457,13 +530,11 @@ class OC_Util { } else if (isset(OC::$REQUESTEDAPP) && !empty(OC::$REQUESTEDAPP)) { $location = OC_Helper::linkToAbsolute( OC::$REQUESTEDAPP, 'index.php' ); - } - else { - $defaultpage = OC_Appconfig::getValue('core', 'defaultpage'); - if ($defaultpage) { - $location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultpage); - } - else { + } else { + $defaultPage = OC_Appconfig::getValue('core', 'defaultpage'); + if ($defaultPage) { + $location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultPage); + } else { $location = OC_Helper::linkToAbsolute( 'files', 'index.php' ); } } @@ -472,28 +543,28 @@ class OC_Util { exit(); } - /** - * get an id unique for this instance - * @return string - */ - public static function getInstanceId() { - $id = OC_Config::getValue('instanceid', null); - if(is_null($id)) { - // We need to guarantee at least one letter in instanceid so it can be used as the session_name - $id = 'oc' . OC_Util::generate_random_bytes(10); - OC_Config::setValue('instanceid', $id); - } - return $id; - } + /** + * @brief get an id unique for this instance + * @return string + */ + public static function getInstanceId() { + $id = OC_Config::getValue('instanceid', null); + if(is_null($id)) { + // We need to guarantee at least one letter in instanceid so it can be used as the session_name + $id = 'oc' . self::generateRandomBytes(10); + OC_Config::setValue('instanceid', $id); + } + return $id; + } /** * @brief Static lifespan (in seconds) when a request token expires. * @see OC_Util::callRegister() * @see OC_Util::isCallRegistered() * @description - * Also required for the client side to compute the piont in time when to + * Also required for the client side to compute the point in time when to * request a fresh token. The client will do so when nearly 97% of the - * timespan coded here has expired. + * time span coded here has expired. */ public static $callLifespan = 3600; // 3600 secs = 1 hour @@ -513,7 +584,7 @@ class OC_Util { // Check if a token exists if(!\OC::$session->exists('requesttoken')) { // No valid token found, generate a new one. - $requestToken = self::generate_random_bytes(20); + $requestToken = self::generateRandomBytes(20); \OC::$session->set('requesttoken', $requestToken); } else { // Valid token already exists, send it @@ -534,11 +605,11 @@ class OC_Util { } if(isset($_GET['requesttoken'])) { - $token=$_GET['requesttoken']; + $token = $_GET['requesttoken']; } elseif(isset($_POST['requesttoken'])) { - $token=$_POST['requesttoken']; + $token = $_POST['requesttoken']; } elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])) { - $token=$_SERVER['HTTP_REQUESTTOKEN']; + $token = $_SERVER['HTTP_REQUESTTOKEN']; } else { //no token found. return false; @@ -556,11 +627,12 @@ class OC_Util { /** * @brief Check an ajax get/post call if the request token is valid. exit if not. - * Todo: Write howto + * @todo Write howto + * @return void */ public static function callCheck() { if(!OC_Util::isCallRegistered()) { - exit; + exit(); } } @@ -570,14 +642,15 @@ class OC_Util { * This function is used to sanitize HTML and should be applied on any * string or array of strings before displaying it on a web page. * - * @param string or array of strings + * @param string|array of strings * @return array with sanitized strings or a single sanitized string, depends on the input parameter. */ public static function sanitizeHTML( &$value ) { if (is_array($value)) { array_walk_recursive($value, 'OC_Util::sanitizeHTML'); } else { - $value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4 + //Specify encoding for PHP<5.4 + $value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8'); } return $value; } @@ -599,17 +672,20 @@ class OC_Util { } /** - * Check if the htaccess file is working by creating a test file in the data directory and trying to access via http + * @brief Check if the htaccess file is working + * @return bool + * @description Check if the htaccess file is working by creating a test + * file in the data directory and trying to access via http */ - public static function ishtaccessworking() { + public static function isHtAccessWorking() { // testdata - $filename='/htaccesstest.txt'; - $testcontent='testcontent'; + $fileName = '/htaccesstest.txt'; + $testContent = 'testcontent'; // creating a test file - $testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename; + $testFile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$fileName; - if(file_exists($testfile)) {// already running this test, possible recursive call + if(file_exists($testFile)) {// already running this test, possible recursive call return false; } @@ -618,7 +694,7 @@ class OC_Util { @fclose($fp); // accessing the file via http - $url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$filename); + $url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$fileName); $fp = @fopen($url, 'r'); $content=@fread($fp, 2048); @fclose($fp); @@ -627,20 +703,21 @@ class OC_Util { @unlink($testfile); // does it work ? - if($content==$testcontent) { - return(false); - }else{ - return(true); + if($content==$testContent) { + return false; + } else { + return true; } } /** - * we test if webDAV is working properly - * + * @brief test if webDAV is working properly + * @return bool + * @description * The basic assumption is that if the server returns 401/Not Authenticated for an unauthenticated PROPFIND * the web server it self is setup properly. * - * Why not an authenticated PROFIND and other verbs? + * Why not an authenticated PROPFIND and other verbs? * - We don't have the password available * - We have no idea about other auth methods implemented (e.g. OAuth with Bearer header) * @@ -654,7 +731,7 @@ class OC_Util { ); // save the old timeout so that we can restore it later - $old_timeout=ini_get("default_socket_timeout"); + $oldTimeout = ini_get("default_socket_timeout"); // use a 5 sec timeout for the check. Should be enough for local requests. ini_set("default_socket_timeout", 5); @@ -668,24 +745,25 @@ class OC_Util { try { // test PROPFIND $client->propfind('', array('{DAV:}resourcetype')); - } catch(\Sabre_DAV_Exception_NotAuthenticated $e) { + } catch (\Sabre_DAV_Exception_NotAuthenticated $e) { $return = true; - } catch(\Exception $e) { + } catch (\Exception $e) { OC_Log::write('core', 'isWebDAVWorking: NO - Reason: '.$e->getMessage(). ' ('.get_class($e).')', OC_Log::WARN); $return = false; } // restore the original timeout - ini_set("default_socket_timeout", $old_timeout); + ini_set("default_socket_timeout", $oldTimeout); return $return; } /** - * Check if the setlocal call doesn't work. This can happen if the right + * Check if the setlocal call does not work. This can happen if the right * local packages are not available on the server. + * @return bool */ - public static function issetlocaleworking() { + public static function isSetLocaleWorking() { // setlocale test is pointless on Windows if (OC_Util::runningOnWindows() ) { return true; @@ -699,7 +777,7 @@ class OC_Util { } /** - * Check if the PHP module fileinfo is loaded. + * @brief Check if the PHP module fileinfo is loaded. * @return bool */ public static function fileInfoLoaded() { @@ -707,7 +785,8 @@ class OC_Util { } /** - * Check if the ownCloud server can connect to the internet + * @brief Check if the ownCloud server can connect to the internet + * @return bool */ public static function isInternetConnectionWorking() { // in case there is no internet connection on purpose return false @@ -720,30 +799,29 @@ class OC_Util { if ($connected) { fclose($connected); return true; - }else{ - + } else { // second try in case one server is down $connected = @fsockopen("apps.owncloud.com", 80); if ($connected) { fclose($connected); return true; - }else{ + } else { return false; } - } - } /** - * Check if the connection to the internet is disabled on purpose + * @brief Check if the connection to the internet is disabled on purpose + * @return bool */ public static function isInternetConnectionEnabled(){ return \OC_Config::getValue("has_internet_connection", true); } /** - * clear all levels of output buffering + * @brief clear all levels of output buffering + * @return void */ public static function obEnd(){ while (ob_get_level()) { @@ -753,47 +831,47 @@ class OC_Util { /** - * @brief Generates a cryptographical secure pseudorandom string - * @param Int with the length of the random string + * @brief Generates a cryptographic secure pseudo-random string + * @param Int $length of the random string * @return String - * Please also update secureRNG_available if you change something here + * Please also update secureRNGAvailable if you change something here */ - public static function generate_random_bytes($length = 30) { - + public static function generateRandomBytes($length = 30) { // Try to use openssl_random_pseudo_bytes - if(function_exists('openssl_random_pseudo_bytes')) { - $pseudo_byte = bin2hex(openssl_random_pseudo_bytes($length, $strong)); + if (function_exists('openssl_random_pseudo_bytes')) { + $pseudoByte = bin2hex(openssl_random_pseudo_bytes($length, $strong)); if($strong == true) { - return substr($pseudo_byte, 0, $length); // Truncate it to match the length + return substr($pseudoByte, 0, $length); // Truncate it to match the length } } // Try to use /dev/urandom - $fp = @file_get_contents('/dev/urandom', false, null, 0, $length); - if ($fp !== false) { - $string = substr(bin2hex($fp), 0, $length); - return $string; + if (!self::runningOnWindows()) { + $fp = @file_get_contents('/dev/urandom', false, null, 0, $length); + if ($fp !== false) { + $string = substr(bin2hex($fp), 0, $length); + return $string; + } } // Fallback to mt_rand() $characters = '0123456789'; $characters .= 'abcdefghijklmnopqrstuvwxyz'; $charactersLength = strlen($characters)-1; - $pseudo_byte = ""; + $pseudoByte = ""; // Select some random characters for ($i = 0; $i < $length; $i++) { - $pseudo_byte .= $characters[mt_rand(0, $charactersLength)]; + $pseudoByte .= $characters[mt_rand(0, $charactersLength)]; } - return $pseudo_byte; + return $pseudoByte; } /** * @brief Checks if a secure random number generator is available * @return bool */ - public static function secureRNG_available() { - + public static function secureRNGAvailable() { // Check openssl_random_pseudo_bytes if(function_exists('openssl_random_pseudo_bytes')) { openssl_random_pseudo_bytes(1, $strong); @@ -803,9 +881,11 @@ class OC_Util { } // Check /dev/urandom - $fp = @file_get_contents('/dev/urandom', false, null, 0, 1); - if ($fp !== false) { - return true; + if (!self::runningOnWindows()) { + $fp = @file_get_contents('/dev/urandom', false, null, 0, 1); + if ($fp !== false) { + return true; + } } return false; @@ -818,11 +898,8 @@ class OC_Util { * This function get the content of a page via curl, if curl is enabled. * If not, file_get_element is used. */ - public static function getUrlContent($url){ - - if (function_exists('curl_init')) { - + if (function_exists('curl_init')) { $curl = curl_init(); curl_setopt($curl, CURLOPT_HEADER, 0); @@ -833,10 +910,10 @@ class OC_Util { curl_setopt($curl, CURLOPT_MAXREDIRS, 10); curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler"); - if(OC_Config::getValue('proxy', '')<>'') { + if(OC_Config::getValue('proxy', '') != '') { curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy')); } - if(OC_Config::getValue('proxyuserpwd', '')<>'') { + if(OC_Config::getValue('proxyuserpwd', '') != '') { curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd')); } $data = curl_exec($curl); @@ -845,7 +922,7 @@ class OC_Util { } else { $contextArray = null; - if(OC_Config::getValue('proxy', '')<>'') { + if(OC_Config::getValue('proxy', '') != '') { $contextArray = array( 'http' => array( 'timeout' => 10, @@ -860,11 +937,10 @@ class OC_Util { ); } - $ctx = stream_context_create( $contextArray ); - $data=@file_get_contents($url, 0, $ctx); + $data = @file_get_contents($url, 0, $ctx); } return $data; @@ -877,7 +953,6 @@ class OC_Util { return (substr(PHP_OS, 0, 3) === "WIN"); } - /** * Handles the case that there may not be a theme, then check if a "default" * theme exists and take that one @@ -887,20 +962,19 @@ class OC_Util { $theme = OC_Config::getValue("theme", ''); if($theme === '') { - if(is_dir(OC::$SERVERROOT . '/themes/default')) { $theme = 'default'; } - } return $theme; } /** - * Clear the opcode cache if one exists + * @brief Clear the opcode cache if one exists * This is necessary for writing to the config file - * in case the opcode cache doesn't revalidate files + * in case the opcode cache does not re-validate files + * @return void */ public static function clearOpcodeCache() { // APC @@ -939,8 +1013,10 @@ class OC_Util { return $value; } - public static function basename($file) - { + /** + * @return string + */ + public static function basename($file) { $file = rtrim($file, '/'); $t = explode('/', $file); return array_pop($t); diff --git a/settings/admin.php b/settings/admin.php index 38b77a615d..120f15bec1 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "admin" ); $tmpl = new OC_Template( 'settings', 'admin', 'user'); $forms=OC_App::getForms('admin'); -$htaccessworking=OC_Util::ishtaccessworking(); +$htaccessworking=OC_Util::isHtAccessWorking(); $entries=OC_Log_Owncloud::getEntries(3); $entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3; @@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('htaccessworking', $htaccessworking); $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false); -$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking()); +$tmpl->assign('islocaleworking', OC_Util::isSetLocaleWorking()); $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking()); $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); diff --git a/settings/l10n/es.php b/settings/l10n/es.php index 4f3099b8c2..52610e1c4f 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -2,7 +2,7 @@ $TRANSLATIONS = array( "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store", "Authentication error" => "Error de autenticación", -"Your display name has been changed." => "Su nombre fue cambiado.", +"Your display name has been changed." => "Su nombre de usuario ha sido cambiado.", "Unable to change display name" => "No se pudo cambiar el nombre de usuario", "Group already exists" => "El grupo ya existe", "Unable to add group" => "No se pudo añadir el grupo", @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Desactivar", "Enable" => "Activar", "Please wait...." => "Espere, por favor....", +"Error while disabling app" => "Error mientras se desactivaba la aplicación", +"Error while enabling app" => "Error mientras se activaba la aplicación", "Updating...." => "Actualizando....", "Error while updating app" => "Error mientras se actualizaba la aplicación", "Error" => "Error", "Update" => "Actualizar", "Updated" => "Actualizado", +"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.", "Saving..." => "Guardando...", "deleted" => "Eliminado", "undo" => "deshacer", @@ -38,12 +41,12 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Se debe proporcionar una contraseña valida", "__language_name__" => "Castellano", "Security Warning" => "Advertencia de seguridad", -"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Su directorio de datos y sus archivos probablemente están accesibles desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Probablemente se puede acceder a su directorio de datos y sus archivos desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.", "Setup Warning" => "Advertencia de configuración", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.", "Please double check the installation guides." => "Por favor, vuelva a comprobar las guías de instalación.", -"Module 'fileinfo' missing" => "Módulo 'fileinfo' perdido", -"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type", +"Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type", "Locale not working" => "La configuración regional no está funcionando", "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "La configuración regional del sistema no se puede ajustar a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivo. Le recomendamos instalar los paquetes necesarios en el sistema para soportar % s.", "Internet connection not working" => "La conexion a internet no esta funcionando", @@ -56,7 +59,7 @@ $TRANSLATIONS = array( "Enable Share API" => "Activar API de Compartición", "Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición", "Allow links" => "Permitir enlaces", -"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos al público con enlaces", +"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces", "Allow public uploads" => "Permitir subidas públicas", "Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente", "Allow resharing" => "Permitir re-compartición", @@ -76,8 +79,8 @@ $TRANSLATIONS = array( "Add your App" => "Añade tu aplicación", "More Apps" => "Más aplicaciones", "Select an App" => "Seleccionar una aplicación", -"See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com", -"-licensed by " => "-licenciado por ", +"See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com", +"-licensed by " => "-licencia otorgada por ", "User Documentation" => "Documentación de usuario", "Administrator Documentation" => "Documentación de adminstrador", "Online Documentation" => "Documentación en linea", @@ -85,7 +88,7 @@ $TRANSLATIONS = array( "Bugtracker" => "Rastreador de fallos", "Commercial Support" => "Soporte comercial", "Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos", -"Show First Run Wizard again" => "Mostrar asistente para iniciar otra vez", +"Show First Run Wizard again" => "Mostrar asistente para iniciar de nuevo", "You have used %s of the available %s" => "Ha usado %s de los %s disponibles", "Password" => "Contraseña", "Your password was changed" => "Su contraseña ha sido cambiada", @@ -98,10 +101,13 @@ $TRANSLATIONS = array( "Your email address" => "Su dirección de correo", "Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña", "Language" => "Idioma", -"Help translate" => "Ayúdnos a traducir", +"Help translate" => "Ayúdanos a traducir", "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Utilice esta dirección paraacceder a sus archivos a través de WebDAV", "Encryption" => "Cifrado", +"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de cifrado no está activada, descifre sus archivos", +"Log-in password" => "Contraseña de acceso", +"Decrypt all Files" => "Descifrar archivos", "Login Name" => "Nombre de usuario", "Create" => "Crear", "Admin Recovery Password" => "Recuperación de la contraseña de administración", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 536cac9656..d973ab30af 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Désactiver", "Enable" => "Activer", "Please wait...." => "Veuillez patienter…", +"Error while disabling app" => "Erreur lors de la désactivation de l'application", +"Error while enabling app" => "Erreur lors de l'activation de l'application", "Updating...." => "Mise à jour...", "Error while updating app" => "Erreur lors de la mise à jour de l'application", "Error" => "Erreur", "Update" => "Mettre à jour", "Updated" => "Mise à jour effectuée avec succès", +"Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.", "Saving..." => "Enregistrement...", "deleted" => "supprimé", "undo" => "annuler", @@ -38,25 +41,35 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Un mot de passe valide doit être saisi", "__language_name__" => "Français", "Security Warning" => "Avertissement de sécurité", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.", "Setup Warning" => "Avertissement, problème de configuration", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.", +"Please double check the installation guides." => "Veuillez consulter à nouveau les guides d'installation.", "Module 'fileinfo' missing" => "Module 'fileinfo' manquant", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.", "Locale not working" => "Localisation non fonctionnelle", +"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Le localisation du système n'a pu être configurée à %s. Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est fortement recommandé d'installer les paquets requis pour le support de %s.", "Internet connection not working" => "La connexion internet ne fonctionne pas", +"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.", "Cron" => "Cron", "Execute one task with each page loaded" => "Exécute une tâche à chaque chargement de page", +"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php est enregistré en tant que service webcron pour appeler cron.php une fois par minute via http.", +"Use systems cron service to call the cron.php file once a minute." => "Utilise le service cron du système pour appeler cron.php une fois par minute.", "Sharing" => "Partage", "Enable Share API" => "Activer l'API de partage", "Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage", "Allow links" => "Autoriser les liens", "Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens", +"Allow public uploads" => "Autoriser les téléversements publics", +"Allow users to enable others to upload into their publicly shared folders" => "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur", "Allow resharing" => "Autoriser le repartage", "Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux", "Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde", "Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement", "Security" => "Sécurité", "Enforce HTTPS" => "Forcer HTTPS", +"Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.", +"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.", "Log" => "Log", "Log level" => "Niveau de log", "More" => "Plus", @@ -92,6 +105,9 @@ $TRANSLATIONS = array( "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Utilisez cette adresse pour accéder à vos fichiers via WebDAV", "Encryption" => "Chiffrement", +"The encryption app is no longer enabled, decrypt all your file" => "L'application de chiffrement n'est plus activée, déchiffrez tous vos fichiers", +"Log-in password" => "Mot de passe de connexion", +"Decrypt all Files" => "Déchiffrer tous les fichiers", "Login Name" => "Nom de la connexion", "Create" => "Créer", "Admin Recovery Password" => "Récupération du mot de passe administrateur", diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php index 1d8619de7e..a8bc60ffed 100644 --- a/settings/l10n/pl.php +++ b/settings/l10n/pl.php @@ -20,11 +20,14 @@ $TRANSLATIONS = array( "Disable" => "Wyłącz", "Enable" => "Włącz", "Please wait...." => "Proszę czekać...", +"Error while disabling app" => "Błąd podczas wyłączania aplikacji", +"Error while enabling app" => "Błąd podczas włączania aplikacji", "Updating...." => "Aktualizacja w toku...", "Error while updating app" => "Błąd podczas aktualizacji aplikacji", "Error" => "Błąd", "Update" => "Aktualizuj", "Updated" => "Zaktualizowano", +"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.", "Saving..." => "Zapisywanie...", "deleted" => "usunięto", "undo" => "cofnij", @@ -38,21 +41,27 @@ $TRANSLATIONS = array( "A valid password must be provided" => "Należy podać prawidłowe hasło", "__language_name__" => "polski", "Security Warning" => "Ostrzeżenie o zabezpieczeniach", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.", "Setup Warning" => "Ostrzeżenia konfiguracji", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.", "Please double check the installation guides." => "Proszę sprawdź ponownie przewodnik instalacji.", "Module 'fileinfo' missing" => "Brak modułu „fileinfo”", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.", "Locale not working" => "Lokalizacja nie działa", +"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System lokalny nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s.", "Internet connection not working" => "Połączenie internetowe nie działa", +"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje.", "Cron" => "Cron", "Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną", +"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na minutę przez http.", +"Use systems cron service to call the cron.php file once a minute." => "Użyj systemowego cron-a do uruchamiania cron.php raz na minutę.", "Sharing" => "Udostępnianie", "Enable Share API" => "Włącz API udostępniania", "Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania", "Allow links" => "Zezwalaj na odnośniki", "Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników", "Allow public uploads" => "Pozwól na publiczne wczytywanie", +"Allow users to enable others to upload into their publicly shared folders" => "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów", "Allow resharing" => "Zezwalaj na ponowne udostępnianie", "Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych", "Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek", @@ -60,6 +69,7 @@ $TRANSLATIONS = array( "Security" => "Bezpieczeństwo", "Enforce HTTPS" => "Wymuś HTTPS", "Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.", +"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.", "Log" => "Logi", "Log level" => "Poziom logów", "More" => "Więcej", @@ -93,7 +103,11 @@ $TRANSLATIONS = array( "Language" => "Język", "Help translate" => "Pomóż w tłumaczeniu", "WebDAV" => "WebDAV", +"Use this address to access your Files via WebDAV" => "Użyj tego adresu do dostępu do twoich plików przez WebDAV", "Encryption" => "Szyfrowanie", +"The encryption app is no longer enabled, decrypt all your file" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik", +"Log-in password" => "Hasło logowania", +"Decrypt all Files" => "Odszyfruj wszystkie pliki", "Login Name" => "Login", "Create" => "Utwórz", "Admin Recovery Password" => "Odzyskiwanie hasła administratora", diff --git a/tests/lib/db.php b/tests/lib/db.php index 51edbf7b30..1977025cf1 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -15,7 +15,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { public function setUp() { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; - $r = '_'.OC_Util::generate_random_bytes('4').'_'; + $r = '_'.OC_Util::generateRandomBytes('4').'_'; $content = file_get_contents( $dbfile ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); file_put_contents( self::$schema_file, $content ); diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index c2e55eabf4..7de90c047c 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -16,7 +16,7 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; $dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml'; - $r = '_'.OC_Util::generate_random_bytes('4').'_'; + $r = '_'.OC_Util::generateRandomBytes('4').'_'; $content = file_get_contents( $dbfile ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); file_put_contents( $this->schema_file, $content ); diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index 3bac9e770a..0de436f570 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -25,7 +25,7 @@ class View extends \PHPUnit_Framework_TestCase { //login \OC_User::createUser('test', 'test'); - $this->user=\OC_User::getUser(); + $this->user = \OC_User::getUser(); \OC_User::setUserId('test'); \OC\Files\Filesystem::clearMounts(); @@ -325,6 +325,35 @@ class View extends \PHPUnit_Framework_TestCase { $this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']); } + /** + * @medium + */ + function testViewHooks() { + $storage1 = $this->getTestStorage(); + $storage2 = $this->getTestStorage(); + $defaultRoot = \OC\Files\Filesystem::getRoot(); + \OC\Files\Filesystem::mount($storage1, array(), '/'); + \OC\Files\Filesystem::mount($storage2, array(), $defaultRoot . '/substorage'); + \OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook'); + + $rootView = new \OC\Files\View(''); + $subView = new \OC\Files\View($defaultRoot . '/substorage'); + $this->hookPath = null; + + $rootView->file_put_contents('/foo.txt', 'asd'); + $this->assertNull($this->hookPath); + + $subView->file_put_contents('/foo.txt', 'asd'); + $this->assertNotNull($this->hookPath); + $this->assertEquals('/substorage/foo.txt', $this->hookPath); + } + + private $hookPath; + + function dummyHook($params) { + $this->hookPath = $params['path']; + } + /** * @param bool $scan * @return \OC\Files\Storage\Storage diff --git a/tests/lib/util.php b/tests/lib/util.php index 13aa49c8c6..d607a3e772 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -71,8 +71,8 @@ class Test_Util extends PHPUnit_Framework_TestCase { $this->assertTrue(\OC_Util::isInternetConnectionEnabled()); } - function testGenerate_random_bytes() { - $result = strlen(OC_Util::generate_random_bytes(59)); + function testGenerateRandomBytes() { + $result = strlen(OC_Util::generateRandomBytes(59)); $this->assertEquals(59, $result); }