diff options
31 files changed, 186 insertions, 89 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 4ff7d0c3fa0..4fa8ca65e39 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -712,6 +712,7 @@ * @param options map of attributes: * - "updateSummary": true to update the summary after adding (default), false otherwise * - "silent": true to prevent firing events like "fileActionsReady" + * - "animate": true to animate preview loading (defaults to true here) * @return new tr element (not appended to the table) */ add: function(fileData, options) { @@ -719,7 +720,7 @@ var $tr; var $rows; var $insertionPoint; - options = options || {}; + options = _.extend({animate: true}, options || {}); // there are three situations to cover: // 1) insertion point is visible on the current page @@ -777,6 +778,7 @@ * @param options map of attributes: * - "index" optional index at which to insert the element * - "updateSummary" true to update the summary after adding (default), false otherwise + * - "animate" true to animate the preview rendering * @return new tr element (not appended to the table) */ _renderRow: function(fileData, options) { @@ -818,7 +820,7 @@ if (fileData.isPreviewAvailable) { // lazy load / newly inserted td ? - if (!fileData.icon) { + if (options.animate) { this.lazyLoadPreview({ path: path + '/' + fileData.name, mime: mime, diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 00035b376c4..97501ead209 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( +"Storage not available" => "A tároló elérhetetlen.", +"Storage invalid" => "A tároló érvénytelen", "Unknown error" => "Ismeretlen hiba", "Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel", "Could not move %s" => "Nem sikerült %s áthelyezése", @@ -43,6 +45,7 @@ $TRANSLATIONS = array( "Error fetching URL" => "A megadott URL-ről nem sikerül adatokat kapni", "Share" => "Megosztás", "Delete" => "Törlés", +"Disconnect storage" => "Tároló leválasztása", "Unshare" => "A megosztás visszavonása", "Delete permanently" => "Végleges törlés", "Rename" => "Átnevezés", diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index d5c65a6c681..c060691b8b5 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -162,7 +162,6 @@ else { file.type = 'file'; if (share.isPreviewAvailable) { - file.icon = true; file.isPreviewAvailable = true; } } diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php index edc474c26c2..c0b59bfc191 100644 --- a/apps/files_sharing/l10n/pt_PT.php +++ b/apps/files_sharing/l10n/pt_PT.php @@ -8,7 +8,11 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Ainda não partilhados quaisquer ficheuiros consigo.", "You haven't shared any files yet." => "Ainda não partilhou quaisquer ficheiros.", "You haven't shared any files by link yet." => "Ainda não partilhou quaisquer ficheiros por hiperligação.", +"Do you want to add the remote share {name} from {owner}@{remote}?" => "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?", +"Remote share" => "Partilha remota", +"Remote share password" => "Password da partilha remota", "Cancel" => "Cancelar", +"Add remote share" => "Adicionar partilha remota", "No ownCloud installation found at {remote}" => "Não foi encontrada uma instalação em {remote}", "Invalid ownCloud url" => "Endereço errado", "Shared by" => "Partilhado por", @@ -23,6 +27,7 @@ $TRANSLATIONS = array( "the link expired" => "A hiperligação expirou", "sharing is disabled" => "a partilha está desativada", "For more info, please ask the person who sent this link." => "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.", +"Add to your ownCloud" => "Adicionar á sua ownCloud", "Download" => "Transferir", "Download %s" => "Transferir %s", "Direct link" => "Hiperligação direta", diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php index 3a0de51192e..855be2872b5 100644 --- a/apps/files_sharing/lib/external/storage.php +++ b/apps/files_sharing/lib/external/storage.php @@ -49,7 +49,12 @@ class Storage extends DAV implements ISharedStorage { $this->remote = $options['remote']; $this->remoteUser = $options['owner']; list($protocol, $remote) = explode('://', $this->remote); - list($host, $root) = explode('/', $remote, 2); + if (strpos($remote, '/')) { + list($host, $root) = explode('/', $remote, 2); + } else { + $host = $remote; + $root = ''; + } $secure = $protocol === 'https'; $root = rtrim($root, '/') . '/public.php/webdav'; $this->mountPoint = $options['mountpoint']; @@ -148,7 +153,7 @@ class Storage extends DAV implements ISharedStorage { // ownCloud instance is gone, likely to be a temporary server configuration error throw $e; } - } catch(\Exception $shareException) { + } catch (\Exception $shareException) { // todo, maybe handle 403 better and ask the user for a new password throw $e; } diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php index 20a136384fb..fb4836c78b0 100644 --- a/apps/user_ldap/l10n/pt_PT.php +++ b/apps/user_ldap/l10n/pt_PT.php @@ -1,6 +1,6 @@ <?php $TRANSLATIONS = array( -"Failed to clear the mappings." => "Falhou a limpar os mapas", +"Failed to clear the mappings." => "Falhou a limpar os mapas.", "Failed to delete the server configuration" => "Erro ao eliminar a configuração do servidor", "The configuration is valid and the connection could be established!" => "A configuração está correcta e foi possível estabelecer a ligação!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração está correcta, mas não foi possível estabelecer o \"laço\", por favor, verifique as configurações do servidor e as credenciais.", diff --git a/core/css/apps.css b/core/css/apps.css index be1a98c3c1e..6761677fb23 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -22,8 +22,7 @@ height: 100%; float: left; -moz-box-sizing: border-box; box-sizing: border-box; - background-color: #f8f8f8; - border-right: 1px solid #ccc; + background-color: #f5f5f5; padding-bottom: 44px; -webkit-user-select: none; -moz-user-select: none; @@ -51,11 +50,6 @@ background-color: #ccc; } -/* special rules for first-level entries and folders */ -#app-navigation > ul > li { - background-color: #f8f8f8; -} - #app-navigation .with-icon a { padding-left: 44px; background-size: 16px 16px; @@ -197,9 +191,8 @@ /* settings area */ #app-settings { position: fixed; - width: 249px; + width: 250px; /* change to 100% when layout positions are absolute */ bottom: 0; - border-top: 1px solid #ccc; } #app-settings.opened #app-settings-content { display: block; diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php index b1be65b4f01..e4d51fde077 100644 --- a/core/lostpassword/controller/lostcontroller.php +++ b/core/lostpassword/controller/lostcontroller.php @@ -20,13 +20,36 @@ use \OC\Core\LostPassword\EncryptedDataException; class LostController extends Controller { + /** + * @var \OCP\IURLGenerator + */ protected $urlGenerator; + + /** + * @var \OCP\IUserManager + */ protected $userManager; + + /** + * @var \OC_Defaults + */ protected $defaults; + + /** + * @var IL10N + */ protected $l10n; protected $from; protected $isDataEncrypted; + + /** + * @var IConfig + */ protected $config; + + /** + * @var IUserSession + */ protected $userSession; public function __construct($appName, @@ -110,7 +133,7 @@ class LostController extends Controller { throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid')); } - if (!$user->setPassword($userId, $password)) { + if (!$user->setPassword($password)) { throw new \Exception(); } @@ -48,6 +48,11 @@ try { require_once 'lib/base.php'; + if (\OCP\Util::needUpgrade()) { + \OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG); + exit(); + } + // load all apps to get all api routes properly setup OC_App::loadApps(); diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index a939cae1dbc..eedd60764e0 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -5,13 +5,14 @@ # Translators: # ebela <bela@dandre.hu>, 2013 # Laszlo Tornoci <torlasz@gmail.com>, 2013-2014 +# Szládovics Péter <peti@szladovics.hu>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-16 01:54-0400\n" -"PO-Revision-Date: 2014-07-15 06:11+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" +"PO-Revision-Date: 2014-07-23 14:01+0000\n" +"Last-Translator: Szládovics Péter <peti@szladovics.hu>\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" @@ -21,11 +22,11 @@ msgstr "" #: ajax/list.php:38 msgid "Storage not available" -msgstr "" +msgstr "A tároló elérhetetlen." #: ajax/list.php:45 msgid "Storage invalid" -msgstr "" +msgstr "A tároló érvénytelen" #: ajax/list.php:52 msgid "Unknown error" @@ -191,7 +192,7 @@ msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a fel msgid "URL cannot be empty" msgstr "Az URL-cím nem maradhat kitöltetlenül" -#: js/file-upload.js:568 js/filelist.js:1259 +#: js/file-upload.js:568 js/filelist.js:1273 msgid "{new_name} already exists" msgstr "{new_name} már létezik" @@ -217,7 +218,7 @@ msgstr "Törlés" #: js/fileactions.js:297 msgid "Disconnect storage" -msgstr "" +msgstr "Tároló leválasztása" #: js/fileactions.js:299 msgid "Unshare" @@ -237,55 +238,55 @@ msgid "" "big." msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok." -#: js/filelist.js:675 js/filelist.js:1783 +#: js/filelist.js:680 js/filelist.js:1797 msgid "Pending" msgstr "Folyamatban" -#: js/filelist.js:1210 +#: js/filelist.js:1224 msgid "Error moving file." msgstr "Hiba történt a fájl áthelyezése közben." -#: js/filelist.js:1218 +#: js/filelist.js:1232 msgid "Error moving file" msgstr "Az állomány áthelyezése nem sikerült." -#: js/filelist.js:1218 +#: js/filelist.js:1232 msgid "Error" msgstr "Hiba" -#: js/filelist.js:1307 +#: js/filelist.js:1321 msgid "Could not rename file" msgstr "Az állomány nem nevezhető át" -#: js/filelist.js:1425 +#: js/filelist.js:1439 msgid "Error deleting file." msgstr "Hiba a file törlése közben." -#: js/filelist.js:1528 templates/list.php:61 +#: js/filelist.js:1542 templates/list.php:61 msgid "Name" msgstr "Név" -#: js/filelist.js:1529 templates/list.php:72 +#: js/filelist.js:1543 templates/list.php:72 msgid "Size" msgstr "Méret" -#: js/filelist.js:1530 templates/list.php:75 +#: js/filelist.js:1544 templates/list.php:75 msgid "Modified" msgstr "Módosítva" -#: js/filelist.js:1540 js/filesummary.js:141 js/filesummary.js:168 +#: js/filelist.js:1554 js/filesummary.js:141 js/filesummary.js:168 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappa" msgstr[1] "%n mappa" -#: js/filelist.js:1546 js/filesummary.js:142 js/filesummary.js:169 +#: js/filelist.js:1560 js/filesummary.js:142 js/filesummary.js:169 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n állomány" msgstr[1] "%n állomány" -#: js/filelist.js:1676 js/filelist.js:1715 +#: js/filelist.js:1690 js/filelist.js:1729 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n állomány feltöltése" diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po index a548c850571..d0daba629b7 100644 --- a/l10n/pt_PT/files_sharing.po +++ b/l10n/pt_PT/files_sharing.po @@ -6,6 +6,7 @@ # zedascouves <duartegrilo@gmail.com>, 2013 # Gonçalo Ferreira <goncalo.ferreira@semcabo.pt>, 2014 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014 +# Luis Jorge Simões das Neves <luisjneves@gmail.com>, 2014 # Manuela Silva <manuela.silva@sky.com>, 2014 # Manuel Oliveira <manuel.oliveira@gmail.com>, 2013 # Andrew_Melim <nokostya.translation@gmail.com>, 2014 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-16 01:54-0400\n" -"PO-Revision-Date: 2014-07-16 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" +"PO-Revision-Date: 2014-07-23 23:20+0000\n" +"Last-Translator: Luis Jorge Simões das Neves <luisjneves@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,15 +59,15 @@ msgstr "Ainda não partilhou quaisquer ficheiros por hiperligação." #: js/external.js:48 js/external.js:59 msgid "Do you want to add the remote share {name} from {owner}@{remote}?" -msgstr "" +msgstr "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?" #: js/external.js:51 js/external.js:62 msgid "Remote share" -msgstr "" +msgstr "Partilha remota" #: js/external.js:65 msgid "Remote share password" -msgstr "" +msgstr "Password da partilha remota" #: js/external.js:76 msgid "Cancel" @@ -74,7 +75,7 @@ msgstr "Cancelar" #: js/external.js:77 msgid "Add remote share" -msgstr "" +msgstr "Adicionar partilha remota" #: js/public.js:203 msgid "No ownCloud installation found at {remote}" @@ -134,7 +135,7 @@ msgstr "Para mais informação, por favor, pergunte à pessoa que lhe enviou est #: templates/public.php:22 msgid "Add to your ownCloud" -msgstr "" +msgstr "Adicionar á sua ownCloud" #: templates/public.php:30 msgid "Download" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index 9d678010c23..c1bdf8c8d84 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -10,6 +10,7 @@ # Fernando Moura <moura232@gmail.com>, 2014 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014 # Jose Manuel Ruas <jmruas@gmail.com>, 2014 +# Luis Jorge Simões das Neves <luisjneves@gmail.com>, 2014 # Nelson Rosado <nelsontrosado@gmail.com>, 2013-2014 # Andrew_Melim <nokostya.translation@gmail.com>, 2014 # PapiMigas <papimigas@gmail.com>, 2013 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-12 01:54-0400\n" -"PO-Revision-Date: 2014-07-10 19:41+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" +"PO-Revision-Date: 2014-07-23 23:51+0000\n" +"Last-Translator: Luis Jorge Simões das Neves <luisjneves@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -121,7 +122,7 @@ msgstr "Não foi possível excluir permanentemente a sua chave de encriptação. #: ajax/installapp.php:18 ajax/uninstallapp.php:18 msgid "Couldn't remove app." -msgstr "" +msgstr "Impossível remover aplicação." #: ajax/lostpassword.php:12 msgid "Email saved" @@ -222,7 +223,7 @@ msgstr "Actualizar para a versão {appversion}" #: js/apps.js:90 msgid "Uninstall App" -msgstr "" +msgstr "Desinstalar aplicação" #: js/apps.js:96 js/apps.js:158 js/apps.js:191 msgid "Disable" @@ -266,15 +267,15 @@ msgstr "Actualizado" #: js/apps.js:233 msgid "Uninstalling ...." -msgstr "" +msgstr "Desinstalando ...." #: js/apps.js:236 msgid "Error while uninstalling app" -msgstr "" +msgstr "Erro durante a desinstalação da aplicação" #: js/apps.js:237 templates/apps.php:56 msgid "Uninstall" -msgstr "" +msgstr "Desinstalar" #: js/personal.js:256 msgid "Select a profile picture" @@ -314,21 +315,21 @@ msgstr "Restaurar chaves encriptadas." #: js/users/deleteHandler.js:166 msgid "Unable to delete {objName}" -msgstr "" +msgstr "Impossível apagar {objNome}" -#: js/users/groups.js:92 js/users/groups.js:197 +#: js/users/groups.js:92 js/users/groups.js:200 msgid "Error creating group" msgstr "Erro ao criar grupo" -#: js/users/groups.js:196 +#: js/users/groups.js:199 msgid "A valid group name must be provided" msgstr "Um nome válido do grupo tem de ser fornecido" -#: js/users/groups.js:224 +#: js/users/groups.js:227 msgid "deleted {groupName}" msgstr "apagar {Nome do grupo}" -#: js/users/groups.js:225 js/users/users.js:296 +#: js/users/groups.js:228 js/users/users.js:296 msgid "undo" msgstr "desfazer" @@ -356,23 +357,23 @@ msgstr "nunca" msgid "deleted {userName}" msgstr "apagar{utilizador}" -#: js/users/users.js:426 +#: js/users/users.js:431 msgid "add group" msgstr "Adicionar grupo" -#: js/users/users.js:621 +#: js/users/users.js:631 msgid "A valid username must be provided" msgstr "Um nome de utilizador válido deve ser fornecido" -#: js/users/users.js:622 js/users/users.js:628 js/users/users.js:643 +#: js/users/users.js:632 js/users/users.js:638 js/users/users.js:653 msgid "Error creating user" msgstr "Erro a criar utilizador" -#: js/users/users.js:627 +#: js/users/users.js:637 msgid "A valid password must be provided" msgstr "Uma password válida deve ser fornecida" -#: js/users/users.js:657 +#: js/users/users.js:669 msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Atenção: a pasta pessoal do utilizador \"{user}\" já existe" @@ -463,13 +464,13 @@ msgstr "Por favor verifique o<a href='%s'>Guia de instalação</a>." msgid "" "PHP is apparently setup to strip inline doc blocks. This will make several " "core apps inaccessible." -msgstr "" +msgstr "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis." #: templates/admin.php:94 msgid "" "This is probably caused by a cache/accelerator such as Zend OPcache or " "eAccelerator." -msgstr "" +msgstr "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador." #: templates/admin.php:105 msgid "Database Performance Info" @@ -480,7 +481,7 @@ msgid "" "SQLite is used as database. For larger installations we recommend to change " "this. To migrate to another database use the command line tool: 'occ db" ":convert-type'" -msgstr "" +msgstr "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'" #: templates/admin.php:119 msgid "Module 'fileinfo' missing" @@ -569,7 +570,7 @@ msgstr "cron.php está registado num serviço webcron para chamar a página cron #: templates/admin.php:229 msgid "Use system's cron service to call the cron.php file every 15 minutes." -msgstr "" +msgstr "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos." #: templates/admin.php:234 msgid "Sharing" @@ -613,7 +614,7 @@ msgstr "Permitir repartilha" #: templates/admin.php:276 msgid "Restrict users to only share with users in their groups" -msgstr "" +msgstr "Restringe os utilizadores só a partilhar com utilizadores do seu grupo" #: templates/admin.php:281 msgid "Allow users to send mail notification for shared files" @@ -756,7 +757,7 @@ msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></ #: templates/apps.php:59 msgid "Enable only for specific groups" -msgstr "" +msgstr "Activar só para grupos específicos" #: templates/apps.php:61 msgid "All" @@ -794,7 +795,7 @@ msgid "" "\t\tor\n" "\t\t<a href=\"https://owncloud.org/promote\"\n" "\t\t\ttarget=\"_blank\">spread the word</a>!" -msgstr "" +msgstr "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!" #: templates/personal.php:31 msgid "Show First Run Wizard again" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index 867bbe381cd..7243fd91acc 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -8,14 +8,15 @@ # Daniel Pinto <daniel@mouxy.net>, 2013 # Fernando Moura <moura232@gmail.com>, 2014 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014 +# Luis Jorge Simões das Neves <luisjneves@gmail.com>, 2014 # Andrew_Melim <nokostya.translation@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-12 01:54-0400\n" -"PO-Revision-Date: 2014-07-10 19:30+0000\n" -"Last-Translator: Fernando Moura <moura232@gmail.com>\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" +"PO-Revision-Date: 2014-07-23 23:10+0000\n" +"Last-Translator: Luis Jorge Simões das Neves <luisjneves@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: ajax/clearMappings.php:34 msgid "Failed to clear the mappings." -msgstr "Falhou a limpar os mapas" +msgstr "Falhou a limpar os mapas." #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 9b8731ac48f..56bc1cc4e09 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 63175c685c4..7e94f6147d8 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 8e3d3cc38fa..d45f6a13887 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 5fc336282c3..1f09795bea7 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 1bcc11459cc..72b81f2bf53 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 83171cb578e..aee522eacdc 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 3cefa92841b..a2e9d0240ae 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 4101e1a0fff..5286e76cc5c 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index c3625f46ab6..0db35e6cd35 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 45e40db0e69..141bcb13bd3 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 3b6c0916d34..2d6915d4bc5 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index a4d8947da29..aff6c9ffc88 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-07-23 01:54-0400\n" +"POT-Creation-Date: 2014-07-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php index 6443cf4ed48..d05f8455551 100644 --- a/lib/private/db/migrator.php +++ b/lib/private/db/migrator.php @@ -110,7 +110,9 @@ class Migrator { $this->dropTable($tmpName); } catch (DBALException $e) { // pgsql needs to commit it's failed transaction before doing anything else - $this->connection->commit(); + if ($this->connection->isTransactionActive()) { + $this->connection->commit(); + } $this->dropTable($tmpName); throw new MigrationException($table->getName(), $e->getMessage()); } diff --git a/lib/private/db/mysqlmigrator.php b/lib/private/db/mysqlmigrator.php index 97495f52032..c0adcdf5df3 100644 --- a/lib/private/db/mysqlmigrator.php +++ b/lib/private/db/mysqlmigrator.php @@ -17,6 +17,10 @@ class MySQLMigrator extends Migrator { * @return \Doctrine\DBAL\Schema\SchemaDiff */ protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { + $platform = $connection->getDatabasePlatform(); + $platform->registerDoctrineTypeMapping('enum', 'string'); + $platform->registerDoctrineTypeMapping('bit', 'string'); + $schemaDiff = parent::getDiff($targetSchema, $connection); // identifiers need to be quoted for mysql diff --git a/lib/private/user/user.php b/lib/private/user/user.php index f9c2cb4d130..993fb4c0c64 100644 --- a/lib/private/user/user.php +++ b/lib/private/user/user.php @@ -156,7 +156,7 @@ class User implements IUser { * @param string $recoveryPassword for the encryption app to reset encryption keys * @return bool */ - public function setPassword($password, $recoveryPassword) { + public function setPassword($password, $recoveryPassword = null) { if ($this->emitter) { $this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword)); } diff --git a/lib/public/iuser.php b/lib/public/iuser.php index dc4acc7658f..c15edcd14dd 100644 --- a/lib/public/iuser.php +++ b/lib/public/iuser.php @@ -18,14 +18,14 @@ interface IUser { public function getUID(); /** - * get the displayname for the user, if no specific displayname is set it will fallback to the user id + * get the display name for the user, if no specific display name is set it will fallback to the user id * * @return string */ public function getDisplayName(); /** - * set the displayname for the user + * set the display name for the user * * @param string $displayName * @return bool @@ -59,7 +59,7 @@ interface IUser { * @param string $recoveryPassword for the encryption app to reset encryption keys * @return bool */ - public function setPassword($password, $recoveryPassword); + public function setPassword($password, $recoveryPassword = null); /** * get the users home folder to mount diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index 54b463903da..9f0d5228633 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -21,6 +21,7 @@ $TRANSLATIONS = array( "Couldn't decrypt your files, check your password and try again" => "Não foi possível desencriptar os seus arquivos. Verifique a sua senha e tente novamente", "Encryption keys deleted permanently" => "A chave de encriptação foi eliminada permanentemente", "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador", +"Couldn't remove app." => "Impossível remover aplicação.", "Email saved" => "Email guardado", "Invalid email" => "Email inválido", "Unable to delete group" => "Impossível apagar grupo", @@ -43,6 +44,7 @@ $TRANSLATIONS = array( "User Documentation" => "Documentação de Utilizador", "Admin Documentation" => "Documentação de administrador.", "Update to {appversion}" => "Actualizar para a versão {appversion}", +"Uninstall App" => "Desinstalar aplicação", "Disable" => "Desactivar", "Enable" => "Activar", "Please wait...." => "Por favor aguarde...", @@ -53,6 +55,9 @@ $TRANSLATIONS = array( "Error" => "Erro", "Update" => "Actualizar", "Updated" => "Actualizado", +"Uninstalling ...." => "Desinstalando ....", +"Error while uninstalling app" => "Erro durante a desinstalação da aplicação", +"Uninstall" => "Desinstalar", "Select a profile picture" => "Seleccione uma fotografia de perfil", "Very weak password" => "Password muito fraca", "Weak password" => "Password fraca", @@ -62,6 +67,7 @@ $TRANSLATIONS = array( "Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.", "Delete encryption keys permanently." => "Excluir as chaves encriptadas de forma permanente.", "Restore encryption keys." => "Restaurar chaves encriptadas.", +"Unable to delete {objName}" => "Impossível apagar {objNome}", "Error creating group" => "Erro ao criar grupo", "A valid group name must be provided" => "Um nome válido do grupo tem de ser fornecido", "deleted {groupName}" => "apagar {Nome do grupo}", @@ -94,7 +100,10 @@ $TRANSLATIONS = array( "Setup Warning" => "Aviso de setup", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.", "Please double check the <a href=\"%s\">installation guides</a>." => "Por favor verifique o<a href='%s'>Guia de instalação</a>.", +"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.", +"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.", "Database Performance Info" => "Informação sobre desempenho da Base de Dados", +"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'", "Module 'fileinfo' missing" => "Falta o módulo 'fileinfo'", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.", "Your PHP version is outdated" => "A sua versão do PHP está ultrapassada", @@ -111,6 +120,7 @@ $TRANSLATIONS = array( "Cron was not executed yet!" => "Cron ainda não foi executado!", "Execute one task with each page loaded" => "Executar uma tarefa com cada página carregada", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.", +"Use system's cron service to call the cron.php file every 15 minutes." => "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.", "Sharing" => "Partilha", "Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha", "Allow users to share via link" => "Permitir que os utilizadores partilhem através do link", @@ -121,6 +131,7 @@ $TRANSLATIONS = array( "days" => "dias", "Enforce expiration date" => "Forçar a data de expiração", "Allow resharing" => "Permitir repartilha", +"Restrict users to only share with users in their groups" => "Restringe os utilizadores só a partilhar com utilizadores do seu grupo", "Allow users to send mail notification for shared files" => "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados", "Exclude groups from sharing" => "Excluir grupos das partilhas", "These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.", @@ -153,6 +164,7 @@ $TRANSLATIONS = array( "See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com", "See application website" => "Ver site da aplicação", "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>", +"Enable only for specific groups" => "Activar só para grupos específicos", "All" => "Todos", "Administrator Documentation" => "Documentação de administrador.", "Online Documentation" => "Documentação Online", @@ -160,6 +172,7 @@ $TRANSLATIONS = array( "Bugtracker" => "Bugtracker", "Commercial Support" => "Suporte Comercial", "Get the apps to sync your files" => "Obtenha as aplicações para sincronizar os seus ficheiros", +"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!", "Show First Run Wizard again" => "Mostrar novamente Wizard de Arranque Inicial", "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>", "Password" => "Password", diff --git a/tests/lib/db/migration.php b/tests/lib/db/migration.php new file mode 100644 index 00000000000..820a1431f54 --- /dev/null +++ b/tests/lib/db/migration.php @@ -0,0 +1,39 @@ +<?php +/** + * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class TestMigration extends \PHPUnit_Framework_TestCase { + + /** @var \Doctrine\DBAL\Connection */ + private $connection; + + /** @var string */ + private $tableName; + + public function setUp() { + $this->connection = \OC_DB::getConnection(); + if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) { + $this->markTestSkipped("Test only relevant on MySql"); + } + + $dbPrefix = \OC::$server->getConfig()->getSystemValue("dbtableprefix"); + $this->tableName = uniqid($dbPrefix . "_enum_bit_test"); + $this->connection->exec("CREATE TABLE $this->tableName(b BIT, e ENUM('1','2','3','4'))"); + } + + public function tearDown() { + $this->connection->getSchemaManager()->dropTable($this->tableName); + } + + public function testNonOCTables() { + $manager = new \OC\DB\MDB2SchemaManager($this->connection); + $manager->updateDbFromStructure(__DIR__ . '/testschema.xml'); + + $this->assertTrue(true); + } + +} |