summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.drone.yml22
-rw-r--r--apps/accessibility/l10n/nl.js2
-rw-r--r--apps/accessibility/l10n/nl.json2
-rw-r--r--apps/files/js/filelist.js60
-rw-r--r--apps/files/templates/list.php2
-rw-r--r--apps/files_external/l10n/pt_BR.js4
-rw-r--r--apps/files_external/l10n/pt_BR.json4
-rw-r--r--apps/files_external/l10n/sk.js1
-rw-r--r--apps/files_external/l10n/sk.json1
-rw-r--r--apps/files_external/lib/Lib/Storage/AmazonS3.php1
-rw-r--r--core/l10n/pt_BR.js4
-rw-r--r--core/l10n/pt_BR.json4
-rw-r--r--core/l10n/sk.js1
-rw-r--r--core/l10n/sk.json1
-rw-r--r--lib/l10n/pt_BR.js2
-rw-r--r--lib/l10n/pt_BR.json2
-rw-r--r--lib/private/NavigationManager.php2
-rwxr-xr-xtests/acceptance/run.sh2
18 files changed, 91 insertions, 26 deletions
diff --git a/.drone.yml b/.drone.yml
index dfc0e18e4c2..ec444529107 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1793,7 +1793,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-access-levels
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-access-levels --selenium-server selenium:4444 allow-git-repository-modifications features/access-levels.feature
@@ -1823,7 +1823,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-app-comments
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-comments --selenium-server selenium:4444 allow-git-repository-modifications features/app-comments.feature
@@ -1853,7 +1853,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-app-files
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature
@@ -1883,7 +1883,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-app-files-sharing
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature
@@ -1913,7 +1913,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-app-files-sharing-link
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature
@@ -1943,7 +1943,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-app-files-tags
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature
@@ -1973,7 +1973,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-app-theming
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-theming --selenium-server selenium:4444 allow-git-repository-modifications features/app-theming.feature
@@ -2003,7 +2003,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-header
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-header --selenium-server selenium:4444 allow-git-repository-modifications features/header.feature
@@ -2033,7 +2033,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-login
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature
@@ -2063,7 +2063,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-users
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-users --selenium-server selenium:4444 allow-git-repository-modifications features/users.feature
@@ -2093,7 +2093,7 @@ steps:
commands:
- git submodule update --init
- name: acceptance-apps
- image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+ image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-apps --selenium-server selenium:4444 allow-git-repository-modifications features/apps.feature
diff --git a/apps/accessibility/l10n/nl.js b/apps/accessibility/l10n/nl.js
index 368da293ad2..601a678e72c 100644
--- a/apps/accessibility/l10n/nl.js
+++ b/apps/accessibility/l10n/nl.js
@@ -2,7 +2,7 @@ OC.L10N.register(
"accessibility",
{
"Dark theme" : "Donker thema",
- "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Een donker thema dat je ogen verlicht door de lichtsterkte en helderheid te verminderen. Dit thema is nog in ontwikkeling, dus we horen het graag als je fouten tegenkomt.",
+ "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Een donker thema dat je ogen verlicht door de lichtsterkte en helderheid te verminderen. Dit thema is nog in ontwikkeling, dus we horen graag van je als je fouten tegenkomt.",
"High contrast mode" : "Hoog contrast modus",
"A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Een thema met hoog contrast dat de navigatie vergemakkelijkt. De visuele kwaliteit vermindert, maar de duidelijkheid neemt toe.",
"Dyslexia font" : "Dyslexie-lettertype",
diff --git a/apps/accessibility/l10n/nl.json b/apps/accessibility/l10n/nl.json
index f2184955244..8ebfa059893 100644
--- a/apps/accessibility/l10n/nl.json
+++ b/apps/accessibility/l10n/nl.json
@@ -1,6 +1,6 @@
{ "translations": {
"Dark theme" : "Donker thema",
- "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Een donker thema dat je ogen verlicht door de lichtsterkte en helderheid te verminderen. Dit thema is nog in ontwikkeling, dus we horen het graag als je fouten tegenkomt.",
+ "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Een donker thema dat je ogen verlicht door de lichtsterkte en helderheid te verminderen. Dit thema is nog in ontwikkeling, dus we horen graag van je als je fouten tegenkomt.",
"High contrast mode" : "Hoog contrast modus",
"A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Een thema met hoog contrast dat de navigatie vergemakkelijkt. De visuele kwaliteit vermindert, maar de duidelijkheid neemt toe.",
"Dyslexia font" : "Dyslexie-lettertype",
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 0e24c09ec07..58e2bfae7ff 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -58,6 +58,12 @@
*/
$fileList: null,
+ $header: null,
+ headers: [],
+
+ $footer: null,
+ footers: [],
+
/**
* @type OCA.Files.BreadCrumb
*/
@@ -262,6 +268,8 @@
this.$container = options.scrollContainer || $(window);
this.$table = $el.find('table:first');
this.$fileList = $el.find('#fileList');
+ this.$header = $el.find('#filelist-header');
+ this.$footer = $el.find('#filelist-footer');
if (!_.isUndefined(this._filesConfig)) {
this._filesConfig.on('change:showhidden', function() {
@@ -408,6 +416,46 @@
OC.Plugins.attach('OCA.Files.FileList', this);
+
+ this.initHeadersAndFooters()
+ },
+
+ initHeadersAndFooters: function() {
+ this.headers.sort(function(a, b) {
+ return a.order - b.order;
+ })
+ this.footers.sort(function(a, b) {
+ return a.order - b.order;
+ })
+ var uniqueIds = [];
+ var self = this;
+ this.headers.forEach(function(header) {
+ if (header.id) {
+ if (uniqueIds.indexOf(header.id) !== -1) {
+ return
+ }
+ uniqueIds.push(header.id)
+ }
+ self.$header.append(header.el)
+
+ setTimeout(function() {
+ header.render(self)
+ }, 0)
+ })
+
+ uniqueIds = [];
+ this.footers.forEach(function(footer) {
+ if (footer.id) {
+ if (uniqueIds.indexOf(footer.id) !== -1) {
+ return
+ }
+ uniqueIds.push(footer.id)
+ }
+ self.$footer.append(footer.el)
+ setTimeout(function() {
+ footer.render(self)
+ }, 0)
+ })
},
/**
@@ -3642,6 +3690,18 @@
}
return null;
+ },
+
+ registerHeader: function(header) {
+ this.headers.push(
+ _.defaults(header, { order: 0 })
+ );
+ },
+
+ registerFooter: function(footer) {
+ this.footers.push(
+ _.defaults(footer, { order: 0 })
+ );
}
};
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 8b20c84e008..697a0a9cf44 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -19,6 +19,7 @@
<input type="hidden" class="max_human_file_size"
value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
</div>
+<div id="filelist-header"></div>
<div id="emptycontent" class="hidden">
<div class="icon-folder"></div>
@@ -68,6 +69,7 @@
<tfoot>
</tfoot>
</table>
+<div id="filelist-footer"></div>
<input type="hidden" name="dir" id="dir" value="" />
<div class="hiddenuploadfield">
<input type="file" id="file_upload_start" class="hiddenuploadfield" name="files[]" />
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index 28ffc3f5219..a5d31dc434f 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -105,12 +105,12 @@ OC.L10N.register(
"SMB / CIFS" : "SMB / CIFS",
"Share" : "Compartilhar",
"Show hidden files" : "Mostrar arquivos ocultos",
- "Timeout" : "Tempo de validade",
+ "Timeout" : "Tempo limite",
"SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
"Username as share" : "Nome de usuário como compartilhamento",
"OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
"Service name" : "Nome do serviço",
- "Request timeout (seconds)" : "Tempo requerido esgotado (segundos)",
+ "Request timeout (seconds)" : "Tempo limite para requisição (segundos)",
"The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "O suporte a cURL no PHP não está habilitado ou instalado. A montagem de %s não foi possível. Por favor, solicite a instalação ao administrador do sistema.",
"The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "O suporte FTP no PHP não está habilitado ou instalado. A montagem de %s não foi possível. Por favor, solicite a instalação ao administrador do sistema.",
"\"%1$s\" is not installed. Mounting of %2$s is not possible. Please ask your system administrator to install it." : "\"%1$s\" não está instalado. A montagem de %2$s não é possível. Peça ao administrador para instalá-lo.",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index 39cd4aca915..8baf7100038 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -103,12 +103,12 @@
"SMB / CIFS" : "SMB / CIFS",
"Share" : "Compartilhar",
"Show hidden files" : "Mostrar arquivos ocultos",
- "Timeout" : "Tempo de validade",
+ "Timeout" : "Tempo limite",
"SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
"Username as share" : "Nome de usuário como compartilhamento",
"OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
"Service name" : "Nome do serviço",
- "Request timeout (seconds)" : "Tempo requerido esgotado (segundos)",
+ "Request timeout (seconds)" : "Tempo limite para requisição (segundos)",
"The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "O suporte a cURL no PHP não está habilitado ou instalado. A montagem de %s não foi possível. Por favor, solicite a instalação ao administrador do sistema.",
"The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "O suporte FTP no PHP não está habilitado ou instalado. A montagem de %s não foi possível. Por favor, solicite a instalação ao administrador do sistema.",
"\"%1$s\" is not installed. Mounting of %2$s is not possible. Please ask your system administrator to install it." : "\"%1$s\" não está instalado. A montagem de %2$s não é possível. Peça ao administrador para instalá-lo.",
diff --git a/apps/files_external/l10n/sk.js b/apps/files_external/l10n/sk.js
index 0f88b35a9b0..517c209dd4e 100644
--- a/apps/files_external/l10n/sk.js
+++ b/apps/files_external/l10n/sk.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"Name" : "Názov",
"Storage type" : "Typ úložiska",
"Scope" : "Rozsah",
+ "Open documentation" : "Otvoriť dokumentáciu",
"External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services." : "Externé úložisko umožňuje pripojiť služby externých úložísk a zariadení ako sekundárne zariadenia na ukladanie pre Nextcloud. Môžete tiež umožniť používateľom pripájať ich vlastné služby externých úložísk.",
"Folder name" : "Názov priečinka",
"External storage" : "Externé úložisko",
diff --git a/apps/files_external/l10n/sk.json b/apps/files_external/l10n/sk.json
index 045ee1dcb2c..71347c955de 100644
--- a/apps/files_external/l10n/sk.json
+++ b/apps/files_external/l10n/sk.json
@@ -119,6 +119,7 @@
"Name" : "Názov",
"Storage type" : "Typ úložiska",
"Scope" : "Rozsah",
+ "Open documentation" : "Otvoriť dokumentáciu",
"External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services." : "Externé úložisko umožňuje pripojiť služby externých úložísk a zariadení ako sekundárne zariadenia na ukladanie pre Nextcloud. Môžete tiež umožniť používateľom pripájať ich vlastné služby externých úložísk.",
"Folder name" : "Názov priečinka",
"External storage" : "Externé úložisko",
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index c6cd6e1b2ca..b5e5d12472d 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -685,7 +685,6 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$source = fopen($tmpFile, 'r');
$this->writeObject($path, $source);
$this->invalidateCache($path);
- fclose($source);
unlink($tmpFile);
return true;
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 8bb7ff05848..d7229d09118 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -390,12 +390,12 @@ OC.L10N.register(
"The theme %s has been disabled." : "O tema %s foi desativado.",
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
"Start update" : "Iniciar atualização",
- "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar atingir o tempo limite em instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
"Detailed logs" : "Logs detalhados",
"Update needed" : "Atualização necessária",
"Please use the command line updater because you have a big instance with more than 50 users." : "Use o atualizador pela linha de comando pois você tem uma grande instalação com mais de 50 usuários",
"For help, see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"%s\">documentation</a>." : "Precisando de ajuda, leia a <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"%s\">documentação</a>.",
- "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "Sei que se continuar atualizando pela interface web, há o risco de ocorrer um timeout e perda de dados mas eu tenho um cópia de backup e sei como restaurar meu sistema se isso ocorrer.",
+ "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "Sei que se continuar atualizando pela interfaceweb, há o risco de atingir o tempo limite e ocorrer perda de dados mas eu tenho um cópia de backup e sei como restaurar meu sistema se isso ocorrer.",
"Upgrade via web on my own risk" : "Atualizar via web por minha conta e risco",
"Maintenance mode" : "Modo de manutenção",
"This %s instance is currently in maintenance mode, which may take a while." : "Esta instância %s está em modo de manutenção, o que pode demorar um pouco.",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index bf00347edfc..9d506592aa5 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -388,12 +388,12 @@
"The theme %s has been disabled." : "O tema %s foi desativado.",
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
"Start update" : "Iniciar atualização",
- "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
+ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar atingir o tempo limite em instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
"Detailed logs" : "Logs detalhados",
"Update needed" : "Atualização necessária",
"Please use the command line updater because you have a big instance with more than 50 users." : "Use o atualizador pela linha de comando pois você tem uma grande instalação com mais de 50 usuários",
"For help, see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"%s\">documentation</a>." : "Precisando de ajuda, leia a <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"%s\">documentação</a>.",
- "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "Sei que se continuar atualizando pela interface web, há o risco de ocorrer um timeout e perda de dados mas eu tenho um cópia de backup e sei como restaurar meu sistema se isso ocorrer.",
+ "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "Sei que se continuar atualizando pela interfaceweb, há o risco de atingir o tempo limite e ocorrer perda de dados mas eu tenho um cópia de backup e sei como restaurar meu sistema se isso ocorrer.",
"Upgrade via web on my own risk" : "Atualizar via web por minha conta e risco",
"Maintenance mode" : "Modo de manutenção",
"This %s instance is currently in maintenance mode, which may take a while." : "Esta instância %s está em modo de manutenção, o que pode demorar um pouco.",
diff --git a/core/l10n/sk.js b/core/l10n/sk.js
index 9a79a4918c2..47d0c6c9252 100644
--- a/core/l10n/sk.js
+++ b/core/l10n/sk.js
@@ -378,6 +378,7 @@ OC.L10N.register(
"Use backup code" : "Použiť záložný kód",
"Cancel log in" : "Zrušiť prihlásenie",
"Setup two-factor authentication" : "Nastaviť dvojzložkové overovanie",
+ "Enhanced security is enforced for your account. Choose which provider to set up:" : "Pre váš účet je vynútená zvýšená bezpečnosť. Vyberte si poskytovateľa, ktorého chcete nastaviť:",
"Error while validating your second factor" : "Chyba počas overovania druhého faktora",
"Access through untrusted domain" : "Prístup cez nedôveryhodnú doménu",
"Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Kontaktujte svojho správcu. Ak ste administrátorom vy, upravte nastavenie \"trusted_domains\" v config/config.php ako napríklad v config.sample.php.",
diff --git a/core/l10n/sk.json b/core/l10n/sk.json
index 179ba38ecef..3d6de7a8f95 100644
--- a/core/l10n/sk.json
+++ b/core/l10n/sk.json
@@ -376,6 +376,7 @@
"Use backup code" : "Použiť záložný kód",
"Cancel log in" : "Zrušiť prihlásenie",
"Setup two-factor authentication" : "Nastaviť dvojzložkové overovanie",
+ "Enhanced security is enforced for your account. Choose which provider to set up:" : "Pre váš účet je vynútená zvýšená bezpečnosť. Vyberte si poskytovateľa, ktorého chcete nastaviť:",
"Error while validating your second factor" : "Chyba počas overovania druhého faktora",
"Access through untrusted domain" : "Prístup cez nedôveryhodnú doménu",
"Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Kontaktujte svojho správcu. Ak ste administrátorom vy, upravte nastavenie \"trusted_domains\" v config/config.php ako napríklad v config.sample.php.",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 4e999187662..be9b2196e50 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -225,7 +225,7 @@ OC.L10N.register(
"Storage incomplete configuration. %s" : "Configuração incompleta do armazenamento. %s",
"Storage connection error. %s" : "Erro na conexão de armazenamento. %s",
"Storage is temporarily not available" : "Armazenamento temporariamente indisponível",
- "Storage connection timeout. %s" : "Esgotado o tempo de conexão ao armazenamento. %s",
+ "Storage connection timeout. %s" : "Atingido o tempo limite de conexão ao armazenamento. %s",
"Create" : "Criar",
"Change" : "Mudar",
"Delete" : "Excluir",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index 5eb6f408c9c..d9546d03d4d 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -223,7 +223,7 @@
"Storage incomplete configuration. %s" : "Configuração incompleta do armazenamento. %s",
"Storage connection error. %s" : "Erro na conexão de armazenamento. %s",
"Storage is temporarily not available" : "Armazenamento temporariamente indisponível",
- "Storage connection timeout. %s" : "Esgotado o tempo de conexão ao armazenamento. %s",
+ "Storage connection timeout. %s" : "Atingido o tempo limite de conexão ao armazenamento. %s",
"Create" : "Criar",
"Change" : "Mudar",
"Delete" : "Excluir",
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index 2c41fbd88c2..2f6befc632c 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -199,7 +199,7 @@ class NavigationManager implements INavigationManager {
'type' => 'settings',
'id' => 'help',
'order' => 5,
- 'href' => $this->urlGenerator->linkToRoute('settings_help'),
+ 'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
'name' => $l->t('Help'),
'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
]);
diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh
index 3e7e0a570ff..48e39bcd119 100755
--- a/tests/acceptance/run.sh
+++ b/tests/acceptance/run.sh
@@ -138,7 +138,7 @@ function prepareDocker() {
# Selenium server.
# The container exits immediately if no command is given, so a Bash session
# is created to prevent that.
- docker run --detach --name=$NEXTCLOUD_LOCAL_CONTAINER --network=container:$SELENIUM_CONTAINER --interactive --tty nextcloudci/acceptance-php7.1:acceptance-php7.1-2 bash
+ docker run --detach --name=$NEXTCLOUD_LOCAL_CONTAINER --network=container:$SELENIUM_CONTAINER --interactive --tty nextcloudci/acceptance-php7.3:acceptance-php7.3-2 bash
# Use the $TMPDIR or, if not set, fall back to /tmp.
NEXTCLOUD_LOCAL_TAR="$($MKTEMP --tmpdir="${TMPDIR:-/tmp}" --suffix=.tar nextcloud-local-XXXXXXXXXX)"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 16:42:37 +0000