summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/nl.js4
-rw-r--r--lib/l10n/nl.json4
-rw-r--r--lib/l10n/pl.js2
-rw-r--r--lib/l10n/pl.json2
-rw-r--r--lib/l10n/pt_BR.js4
-rw-r--r--lib/l10n/pt_BR.json4
-rw-r--r--lib/l10n/ru.js1
-rw-r--r--lib/l10n/ru.json1
-rw-r--r--lib/private/Template/CSSResourceLocator.php2
-rwxr-xr-xlib/private/Template/ResourceLocator.php2
10 files changed, 18 insertions, 8 deletions
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 0fe0e07be77..5647dc4797b 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -110,10 +110,11 @@ OC.L10N.register(
"Sharing %s failed, because the sharing backend for %s could not find its source" : "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden",
"Sharing %s failed, because the file could not be found in the file cache" : "Delen van %s is mislukt, omdat het bestand niet in de bestandscache kon worden gevonden",
"Cannot increase permissions of %s" : "Kan de rechten van %s niet verruimen",
- "Files can't be shared with delete permissions" : "Bestanden kunnen niet worden gedeeld met verwijderrechten",
+ "Files can't be shared with delete permissions" : "Bestanden kunnen niet worden gedeeld met verwijder rechten",
"Files can't be shared with create permissions" : "Bestanden kunnen niet worden gedeeld met creatie rechten",
"Expiration date is in the past" : "De vervaldatum ligt in het verleden",
"Cannot set expiration date more than %s days in the future" : "Kan vervaldatum niet verder dan %s dagen in de toekomst instellen",
+ "The requested share does not exist anymore" : "De vezochte share bestaat niet meer",
"Could not find category \"%s\"" : "Kon categorie \"%s\" niet vinden",
"Sunday" : "Zondag",
"Monday" : "maandag",
@@ -206,6 +207,7 @@ OC.L10N.register(
"Your data directory must be an absolute path" : "Je data map moet een absoluut pad hebben",
"Check the value of \"datadirectory\" in your configuration" : "Controleer de waarde van \"datadirectory\" in je configuratie",
"Your data directory is invalid" : "Je datamap is ongeldig",
+ "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Zorg dat er een bestand genaamd \".ocdata\" in de root van de bestandsmap is.",
"Could not obtain lock type %d on \"%s\"." : "Kon geen lock type %d krijgen op \"%s\".",
"Storage unauthorized. %s" : "Opslag niet toegestaan. %s",
"Storage incomplete configuration. %s" : "Incomplete opslagconfiguratie. %s",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 8ac29f70fd7..403058164d6 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -108,10 +108,11 @@
"Sharing %s failed, because the sharing backend for %s could not find its source" : "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden",
"Sharing %s failed, because the file could not be found in the file cache" : "Delen van %s is mislukt, omdat het bestand niet in de bestandscache kon worden gevonden",
"Cannot increase permissions of %s" : "Kan de rechten van %s niet verruimen",
- "Files can't be shared with delete permissions" : "Bestanden kunnen niet worden gedeeld met verwijderrechten",
+ "Files can't be shared with delete permissions" : "Bestanden kunnen niet worden gedeeld met verwijder rechten",
"Files can't be shared with create permissions" : "Bestanden kunnen niet worden gedeeld met creatie rechten",
"Expiration date is in the past" : "De vervaldatum ligt in het verleden",
"Cannot set expiration date more than %s days in the future" : "Kan vervaldatum niet verder dan %s dagen in de toekomst instellen",
+ "The requested share does not exist anymore" : "De vezochte share bestaat niet meer",
"Could not find category \"%s\"" : "Kon categorie \"%s\" niet vinden",
"Sunday" : "Zondag",
"Monday" : "maandag",
@@ -204,6 +205,7 @@
"Your data directory must be an absolute path" : "Je data map moet een absoluut pad hebben",
"Check the value of \"datadirectory\" in your configuration" : "Controleer de waarde van \"datadirectory\" in je configuratie",
"Your data directory is invalid" : "Je datamap is ongeldig",
+ "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Zorg dat er een bestand genaamd \".ocdata\" in de root van de bestandsmap is.",
"Could not obtain lock type %d on \"%s\"." : "Kon geen lock type %d krijgen op \"%s\".",
"Storage unauthorized. %s" : "Opslag niet toegestaan. %s",
"Storage incomplete configuration. %s" : "Incomplete opslagconfiguratie. %s",
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
index 184a2351f12..dbe867c6b0f 100644
--- a/lib/l10n/pl.js
+++ b/lib/l10n/pl.js
@@ -114,6 +114,7 @@ OC.L10N.register(
"Files can't be shared with create permissions" : "Pliki nie mogą być współdzielony z uprawnieniami tworzenia",
"Expiration date is in the past" : "Data ważności jest przeszła",
"Cannot set expiration date more than %s days in the future" : "Nie można utworzyć daty wygaśnięcia na %s dni do przodu",
+ "The requested share does not exist anymore" : "Żądany obiekt współdzielony już nie istnieje",
"Could not find category \"%s\"" : "Nie można odnaleźć kategorii \"%s\"",
"Sunday" : "Niedziela",
"Monday" : "Poniedziałek",
@@ -206,6 +207,7 @@ OC.L10N.register(
"Your data directory must be an absolute path" : "Twój katalog z danymi musi być ścieżką absolutną",
"Check the value of \"datadirectory\" in your configuration" : "Sprawdź wartość \"datadirectory\" w swojej konfiguracji",
"Your data directory is invalid" : "Twój katalog z danymi jest nieprawidłowy",
+ "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Upewnij się, że istnieje plik \".ocdata\" w katalogu z danymi, data/",
"Could not obtain lock type %d on \"%s\"." : "Nie można uzyskać blokady typu %d na \"%s\".",
"Storage unauthorized. %s" : "Magazyn nieautoryzowany. %s",
"Storage incomplete configuration. %s" : "Niekompletna konfiguracja magazynu. %s",
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
index d5e704706a4..63ac7a31481 100644
--- a/lib/l10n/pl.json
+++ b/lib/l10n/pl.json
@@ -112,6 +112,7 @@
"Files can't be shared with create permissions" : "Pliki nie mogą być współdzielony z uprawnieniami tworzenia",
"Expiration date is in the past" : "Data ważności jest przeszła",
"Cannot set expiration date more than %s days in the future" : "Nie można utworzyć daty wygaśnięcia na %s dni do przodu",
+ "The requested share does not exist anymore" : "Żądany obiekt współdzielony już nie istnieje",
"Could not find category \"%s\"" : "Nie można odnaleźć kategorii \"%s\"",
"Sunday" : "Niedziela",
"Monday" : "Poniedziałek",
@@ -204,6 +205,7 @@
"Your data directory must be an absolute path" : "Twój katalog z danymi musi być ścieżką absolutną",
"Check the value of \"datadirectory\" in your configuration" : "Sprawdź wartość \"datadirectory\" w swojej konfiguracji",
"Your data directory is invalid" : "Twój katalog z danymi jest nieprawidłowy",
+ "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Upewnij się, że istnieje plik \".ocdata\" w katalogu z danymi, data/",
"Could not obtain lock type %d on \"%s\"." : "Nie można uzyskać blokady typu %d na \"%s\".",
"Storage unauthorized. %s" : "Magazyn nieautoryzowany. %s",
"Storage incomplete configuration. %s" : "Niekompletna konfiguracja magazynu. %s",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 62022907243..edfc97dc1d8 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -75,7 +75,7 @@ OC.L10N.register(
"PostgreSQL username and/or password not valid" : "Nome de usuário e/ou senha PostgreSQL inválidos",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
"For the best results, please consider using a GNU/Linux server instead." : "Para obter melhores resultados, por favor considere o uso de um servidor GNU/Linux em seu lugar.",
- "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Aparentemente a instância %s está rodando em um ambiente PHP de 32 bits e o open_basedir foi configurado no php.ini. Isto pode gerar problemas com arquivos maiores que 4GB e é altamente desencorajado.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Aparentemente a instância %s está rodando em um ambiente PHP de 32 bits e o open_basedir foi configurado no php.ini. Isto pode gerar problemas com arquivos maiores que 4GB e é altamente não recomendável.",
"Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Por favor, remova a configuração de open_basedir de seu php.ini ou mude o PHP para 64bit.",
"Set an admin username." : "Defina um nome do usuário administrador.",
"Set an admin password." : "Defina uma senha para o administrador.",
@@ -130,7 +130,7 @@ OC.L10N.register(
"Thu." : "Qui.",
"Fri." : "Sex.",
"Sat." : "Sab.",
- "Su" : "Do",
+ "Su" : "Su",
"Mo" : "Se",
"Tu" : "Te",
"We" : "Qu",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index 17a15ce8de4..65cd35be403 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -73,7 +73,7 @@
"PostgreSQL username and/or password not valid" : "Nome de usuário e/ou senha PostgreSQL inválidos",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
"For the best results, please consider using a GNU/Linux server instead." : "Para obter melhores resultados, por favor considere o uso de um servidor GNU/Linux em seu lugar.",
- "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Aparentemente a instância %s está rodando em um ambiente PHP de 32 bits e o open_basedir foi configurado no php.ini. Isto pode gerar problemas com arquivos maiores que 4GB e é altamente desencorajado.",
+ "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Aparentemente a instância %s está rodando em um ambiente PHP de 32 bits e o open_basedir foi configurado no php.ini. Isto pode gerar problemas com arquivos maiores que 4GB e é altamente não recomendável.",
"Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Por favor, remova a configuração de open_basedir de seu php.ini ou mude o PHP para 64bit.",
"Set an admin username." : "Defina um nome do usuário administrador.",
"Set an admin password." : "Defina uma senha para o administrador.",
@@ -128,7 +128,7 @@
"Thu." : "Qui.",
"Fri." : "Sex.",
"Sat." : "Sab.",
- "Su" : "Do",
+ "Su" : "Su",
"Mo" : "Se",
"Tu" : "Te",
"We" : "Qu",
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index da555faa96e..d61a42087b4 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -114,6 +114,7 @@ OC.L10N.register(
"Files can't be shared with create permissions" : "Файлы не могут иметь общий доступ с правами на создание",
"Expiration date is in the past" : "Дата окончания срока действия уже прошла",
"Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней",
+ "The requested share does not exist anymore" : "Запрошенный общий ресурс более не существует.",
"Could not find category \"%s\"" : "Категория «%s» не найдена",
"Sunday" : "Воскресенье",
"Monday" : "Понедельник",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index 1600687c820..46bb4350218 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -112,6 +112,7 @@
"Files can't be shared with create permissions" : "Файлы не могут иметь общий доступ с правами на создание",
"Expiration date is in the past" : "Дата окончания срока действия уже прошла",
"Cannot set expiration date more than %s days in the future" : "Невозможно установить дату окончания срока действия более %s дней",
+ "The requested share does not exist anymore" : "Запрошенный общий ресурс более не существует.",
"Could not find category \"%s\"" : "Категория «%s» не найдена",
"Sunday" : "Воскресенье",
"Monday" : "Понедельник",
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
index 0150449ac9f..32dabb48c0d 100644
--- a/lib/private/Template/CSSResourceLocator.php
+++ b/lib/private/Template/CSSResourceLocator.php
@@ -117,7 +117,7 @@ class CSSResourceLocator extends ResourceLocator {
parent::append($root, $file, $webRoot, $throw);
} else {
if (!$webRoot) {
- $tmpRoot = $root;
+ $tmpRoot = realpath($root);
/*
* traverse the potential web roots upwards in the path
*
diff --git a/lib/private/Template/ResourceLocator.php b/lib/private/Template/ResourceLocator.php
index 4e733d28f26..f721906e12b 100755
--- a/lib/private/Template/ResourceLocator.php
+++ b/lib/private/Template/ResourceLocator.php
@@ -125,7 +125,7 @@ abstract class ResourceLocator {
}
if (!$webRoot) {
- $tmpRoot = $root;
+ $tmpRoot = realpath($root);
/*
* traverse the potential web roots upwards in the path
*
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 06:12:37 +0000