diff options
273 files changed, 945 insertions, 1233 deletions
diff --git a/apps/federatedfilesharing/l10n/es.js b/apps/federatedfilesharing/l10n/es.js index 8fb64208477..5c544df32a8 100644 --- a/apps/federatedfilesharing/l10n/es.js +++ b/apps/federatedfilesharing/l10n/es.js @@ -20,6 +20,7 @@ OC.L10N.register( "It is not allowed to send federated group shares from this server." : "No está permitido enviar compartidos de grupos federados desde este servidor.", "Sharing %1$s failed, because this item is already shared with user %2$s" : "Fallo al compartir %1$s porque este objeto ya está compartido con el usuario %2$s", "Not allowed to create a federated share with the same user" : "No se permite crear un recurso compartido federado con el mismo usuario", + "Federated shares require read permissions" : "Los recursos compartidos federados necesitan permiso de lectura", "File is already shared with %s" : "El archivo ya está siendo compartido con %s", "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate." : "Compartir %1$s ha fallado, no se ha podido encontrar %2$s, quizás el servidor no se puede alcanzar ahora mismo o usa un certificado autofirmado.", "Could not find share" : "No se ha podido encontrar el compartido", diff --git a/apps/federatedfilesharing/l10n/es.json b/apps/federatedfilesharing/l10n/es.json index c5d2657972d..84d830f9431 100644 --- a/apps/federatedfilesharing/l10n/es.json +++ b/apps/federatedfilesharing/l10n/es.json @@ -18,6 +18,7 @@ "It is not allowed to send federated group shares from this server." : "No está permitido enviar compartidos de grupos federados desde este servidor.", "Sharing %1$s failed, because this item is already shared with user %2$s" : "Fallo al compartir %1$s porque este objeto ya está compartido con el usuario %2$s", "Not allowed to create a federated share with the same user" : "No se permite crear un recurso compartido federado con el mismo usuario", + "Federated shares require read permissions" : "Los recursos compartidos federados necesitan permiso de lectura", "File is already shared with %s" : "El archivo ya está siendo compartido con %s", "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate." : "Compartir %1$s ha fallado, no se ha podido encontrar %2$s, quizás el servidor no se puede alcanzar ahora mismo o usa un certificado autofirmado.", "Could not find share" : "No se ha podido encontrar el compartido", diff --git a/apps/federatedfilesharing/l10n/eu.js b/apps/federatedfilesharing/l10n/eu.js index 7cb1a0dc5f1..148e83e4ee7 100644 --- a/apps/federatedfilesharing/l10n/eu.js +++ b/apps/federatedfilesharing/l10n/eu.js @@ -20,6 +20,7 @@ OC.L10N.register( "It is not allowed to send federated group shares from this server." : "Ezin dira federatutako talde-partekatzeak bidali zerbitzari honetatik.", "Sharing %1$s failed, because this item is already shared with user %2$s" : "%1$spartekatzeak huts egin du dagoeneko %2$serabiltzailearekin partekatuta dagoelako", "Not allowed to create a federated share with the same user" : "Ezin da erabiltzaile berdinarekin federatutako partekatzea sortu.", + "Federated shares require read permissions" : "Federatutako partekatzeek irakurtzeko baimenak behar dituzte", "File is already shared with %s" : "Fitxategia 1%s-rekin partekatua dago iada", "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate." : "%1$s partekatzeak huts egin du, ezin izan da %2$s aurkitu, agian zerbitzaria lineaz kanpo dago edo bere buruak sinatutako ziurtagiria darabil.", "Could not find share" : "Ezin da partekatzea topatu", diff --git a/apps/federatedfilesharing/l10n/eu.json b/apps/federatedfilesharing/l10n/eu.json index c3c3eaadc83..88421fea023 100644 --- a/apps/federatedfilesharing/l10n/eu.json +++ b/apps/federatedfilesharing/l10n/eu.json @@ -18,6 +18,7 @@ "It is not allowed to send federated group shares from this server." : "Ezin dira federatutako talde-partekatzeak bidali zerbitzari honetatik.", "Sharing %1$s failed, because this item is already shared with user %2$s" : "%1$spartekatzeak huts egin du dagoeneko %2$serabiltzailearekin partekatuta dagoelako", "Not allowed to create a federated share with the same user" : "Ezin da erabiltzaile berdinarekin federatutako partekatzea sortu.", + "Federated shares require read permissions" : "Federatutako partekatzeek irakurtzeko baimenak behar dituzte", "File is already shared with %s" : "Fitxategia 1%s-rekin partekatua dago iada", "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate." : "%1$s partekatzeak huts egin du, ezin izan da %2$s aurkitu, agian zerbitzaria lineaz kanpo dago edo bere buruak sinatutako ziurtagiria darabil.", "Could not find share" : "Ezin da partekatzea topatu", diff --git a/apps/federatedfilesharing/l10n/nl.js b/apps/federatedfilesharing/l10n/nl.js index 3800a6eb422..11b371c0a88 100644 --- a/apps/federatedfilesharing/l10n/nl.js +++ b/apps/federatedfilesharing/l10n/nl.js @@ -18,6 +18,7 @@ OC.L10N.register( "Federated Share request sent, you will receive an invitation. Check your notifications." : "De gefedereerde share aanvraag is verzonden, je ontvangt een uitnodiging. Controleer je meldingen.", "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Kon geen gefedereerde share tot stand brengen, waarschijnlijk was de federatieserver te oud (Nextcloud <=9).", "It is not allowed to send federated group shares from this server." : "Het is niet toegestaan om gefedereerde groepsshares vanaf deze server te versturen.", + "Sharing %1$s failed, because this item is already shared with user %2$s" : "Delen van %1$s is mislukt omdat het object al wordt gedeeld met gebruiker %2$s", "Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken", "File is already shared with %s" : "Bestand is al gedeeld met %s", "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate." : "Delen van %1$s mislukt, kon %2$s niet vinden, misschien is de server niet bereikbaar of je gebruikt een zelf-ondertekend certificaat.", diff --git a/apps/federatedfilesharing/l10n/nl.json b/apps/federatedfilesharing/l10n/nl.json index 1dd55116c63..90410630f09 100644 --- a/apps/federatedfilesharing/l10n/nl.json +++ b/apps/federatedfilesharing/l10n/nl.json @@ -16,6 +16,7 @@ "Federated Share request sent, you will receive an invitation. Check your notifications." : "De gefedereerde share aanvraag is verzonden, je ontvangt een uitnodiging. Controleer je meldingen.", "Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Kon geen gefedereerde share tot stand brengen, waarschijnlijk was de federatieserver te oud (Nextcloud <=9).", "It is not allowed to send federated group shares from this server." : "Het is niet toegestaan om gefedereerde groepsshares vanaf deze server te versturen.", + "Sharing %1$s failed, because this item is already shared with user %2$s" : "Delen van %1$s is mislukt omdat het object al wordt gedeeld met gebruiker %2$s", "Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken", "File is already shared with %s" : "Bestand is al gedeeld met %s", "Sharing %1$s failed, could not find %2$s, maybe the server is currently unreachable or uses a self-signed certificate." : "Delen van %1$s mislukt, kon %2$s niet vinden, misschien is de server niet bereikbaar of je gebruikt een zelf-ondertekend certificaat.", diff --git a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php index 63877f3307c..e21ce633dd2 100644 --- a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php +++ b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php @@ -31,6 +31,7 @@ namespace OCA\FederatedFileSharing\OCM; use OC\AppFramework\Http; use OC\Files\Filesystem; +use OC\HintException; use OCA\FederatedFileSharing\AddressHandler; use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\Files_Sharing\Activity\Providers\RemoteShares; @@ -678,24 +679,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider { * @throws BadRequestException */ protected function updateResharePermissions($id, array $notification) { - if (!isset($notification['sharedSecret'])) { - throw new BadRequestException(['sharedSecret']); - } - $token = $notification['sharedSecret']; - - if (!isset($notification['permission'])) { - throw new BadRequestException(['permission']); - } - $ocmPermissions = $notification['permission']; - - $share = $this->federatedShareProvider->getShareById($id); - - $ncPermission = $this->ocmPermissions2ncPermissions($ocmPermissions); - - $this->verifyShare($share, $token); - $this->updatePermissionsInDatabase($share, $ncPermission); - - return []; + throw new HintException('Updating reshares not allowed'); } /** diff --git a/apps/federation/appinfo/routes.php b/apps/federation/appinfo/routes.php index 706bbdc000c..15ade1536b3 100644 --- a/apps/federation/appinfo/routes.php +++ b/apps/federation/appinfo/routes.php @@ -34,11 +34,6 @@ return [ 'url' => '/trusted-servers/{id}', 'verb' => 'DELETE' ], - [ - 'name' => 'Settings#autoAddServers', - 'url' => '/auto-add-servers', - 'verb' => 'POST' - ], ], 'ocs' => [ // old endpoints, only used by Nextcloud and ownCloud diff --git a/apps/federation/composer/composer/autoload_classmap.php b/apps/federation/composer/composer/autoload_classmap.php index fecbe8851b1..14d06fad8aa 100644 --- a/apps/federation/composer/composer/autoload_classmap.php +++ b/apps/federation/composer/composer/autoload_classmap.php @@ -15,8 +15,6 @@ return array( 'OCA\\Federation\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php', 'OCA\\Federation\\DAV\\FedAuth' => $baseDir . '/../lib/DAV/FedAuth.php', 'OCA\\Federation\\DbHandler' => $baseDir . '/../lib/DbHandler.php', - 'OCA\\Federation\\Hooks' => $baseDir . '/../lib/Hooks.php', - 'OCA\\Federation\\Listener\\FederatedShareAddedListener' => $baseDir . '/../lib/Listener/FederatedShareAddedListener.php', 'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => $baseDir . '/../lib/Listener/SabrePluginAuthInitListener.php', 'OCA\\Federation\\Middleware\\AddServerMiddleware' => $baseDir . '/../lib/Middleware/AddServerMiddleware.php', 'OCA\\Federation\\Migration\\Version1010Date20200630191302' => $baseDir . '/../lib/Migration/Version1010Date20200630191302.php', diff --git a/apps/federation/composer/composer/autoload_static.php b/apps/federation/composer/composer/autoload_static.php index 428afb88f98..927aca66949 100644 --- a/apps/federation/composer/composer/autoload_static.php +++ b/apps/federation/composer/composer/autoload_static.php @@ -30,8 +30,6 @@ class ComposerStaticInitFederation 'OCA\\Federation\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php', 'OCA\\Federation\\DAV\\FedAuth' => __DIR__ . '/..' . '/../lib/DAV/FedAuth.php', 'OCA\\Federation\\DbHandler' => __DIR__ . '/..' . '/../lib/DbHandler.php', - 'OCA\\Federation\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php', - 'OCA\\Federation\\Listener\\FederatedShareAddedListener' => __DIR__ . '/..' . '/../lib/Listener/FederatedShareAddedListener.php', 'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => __DIR__ . '/..' . '/../lib/Listener/SabrePluginAuthInitListener.php', 'OCA\\Federation\\Middleware\\AddServerMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/AddServerMiddleware.php', 'OCA\\Federation\\Migration\\Version1010Date20200630191302' => __DIR__ . '/..' . '/../lib/Migration/Version1010Date20200630191302.php', diff --git a/apps/federation/js/settings-admin.js b/apps/federation/js/settings-admin.js index 251ea4c4a34..d8ec194dcda 100644 --- a/apps/federation/js/settings-admin.js +++ b/apps/federation/js/settings-admin.js @@ -19,7 +19,7 @@ */ (function( $ ) { - + // ocFederationAddServer $.fn.ocFederationAddServer = function() { @@ -27,14 +27,13 @@ ========================================================================== */ var $wrapper = $(this), - + // Buttons $btnAddServer = $wrapper.find("#ocFederationAddServerButton"), $btnSubmit = $wrapper.find("#ocFederationSubmit"), - + // Inputs $inpServerUrl = $wrapper.find("#serverUrl"), - $inpAutoAddServers = $wrapper.find("#autoAddServers"), // misc $msgBox = $wrapper.find("#ocFederationAddServer .msg"), @@ -55,17 +54,8 @@ $srvList.on('click', 'li > .icon-delete', function() { var $this = $(this).parent(); var id = $this.attr('id'); - - removeServer( id ); - }); - $inpAutoAddServers.on("change", function() { - $.post( - OC.generateUrl('/apps/federation/auto-add-servers'), - { - autoAddServers: $(this).is(":checked") - } - ); + removeServer( id ); }); $btnSubmit.on("click", function() @@ -94,7 +84,7 @@ } }); }; - + /* private Functions ========================================================================== */ @@ -132,11 +122,11 @@ }); } - + })( jQuery ); window.addEventListener('DOMContentLoaded', function () { $('#ocFederationSettings').ocFederationAddServer(); - + }); diff --git a/apps/federation/l10n/ar.js b/apps/federation/l10n/ar.js index d95f532bec0..285b13950f5 100644 --- a/apps/federation/l10n/ar.js +++ b/apps/federation/l10n/ar.js @@ -5,9 +5,9 @@ OC.L10N.register( "Could not add server" : "تعذَّرت إضافة خادم", "Federation" : "الإتحاد", "Trusted servers" : "الخوادم الموثوق فيها", - "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد", "+ Add trusted server" : "+ إضافة خادوم موثوق فيه", "Trusted server" : "خادوم موثوق فيه", - "Add" : "إضافة" + "Add" : "إضافة", + "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد" }, "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"); diff --git a/apps/federation/l10n/ar.json b/apps/federation/l10n/ar.json index 749443171ff..a55947ea286 100644 --- a/apps/federation/l10n/ar.json +++ b/apps/federation/l10n/ar.json @@ -3,9 +3,9 @@ "Could not add server" : "تعذَّرت إضافة خادم", "Federation" : "الإتحاد", "Trusted servers" : "الخوادم الموثوق فيها", - "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد", "+ Add trusted server" : "+ إضافة خادوم موثوق فيه", "Trusted server" : "خادوم موثوق فيه", - "Add" : "إضافة" + "Add" : "إضافة", + "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد" },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;" }
\ No newline at end of file diff --git a/apps/federation/l10n/br.js b/apps/federation/l10n/br.js index 9cedc25e9a4..47f4a6e7cf7 100644 --- a/apps/federation/l10n/br.js +++ b/apps/federation/l10n/br.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Aotreañ a ra deoc'h ar gevread d'en em genstagañ gant servijrourienn fiziet all evit eskemm teuliadoù. Da skouer implijet e vo evit klokañ en un doare otomatek implijourienn diavaez evit rannadennoù kevredet.", "Trusted servers" : "Servijourienn fiziet", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Aotreañ a ra deoc'h ar gevread d'en em genstagañ gant servijrourienn fiziet all evit eskemm teuliadoù. Da skouer implijet e vo evit klokañ en un doare otomatek implijourienn diavaez evit rannadennoù kevredet. N'eo ket rediet ouzhpennañ ur servijour fiziet evit kroui ur rannadenn kevredet.", - "Add server automatically once a federated share was created successfully" : "Ouzhpennañ ur servijour en un doare otomatek ur wech krouet mar ar rannadenn kevredet", "+ Add trusted server" : "+ Ouzhpenna ur servijour fiziet", "Trusted server" : "Servijour fiziet", - "Add" : "Ouzhpennañ" + "Add" : "Ouzhpennañ", + "Add server automatically once a federated share was created successfully" : "Ouzhpennañ ur servijour en un doare otomatek ur wech krouet mar ar rannadenn kevredet" }, "nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"); diff --git a/apps/federation/l10n/br.json b/apps/federation/l10n/br.json index a0f2dbf0100..140d69ba066 100644 --- a/apps/federation/l10n/br.json +++ b/apps/federation/l10n/br.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Aotreañ a ra deoc'h ar gevread d'en em genstagañ gant servijrourienn fiziet all evit eskemm teuliadoù. Da skouer implijet e vo evit klokañ en un doare otomatek implijourienn diavaez evit rannadennoù kevredet.", "Trusted servers" : "Servijourienn fiziet", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Aotreañ a ra deoc'h ar gevread d'en em genstagañ gant servijrourienn fiziet all evit eskemm teuliadoù. Da skouer implijet e vo evit klokañ en un doare otomatek implijourienn diavaez evit rannadennoù kevredet. N'eo ket rediet ouzhpennañ ur servijour fiziet evit kroui ur rannadenn kevredet.", - "Add server automatically once a federated share was created successfully" : "Ouzhpennañ ur servijour en un doare otomatek ur wech krouet mar ar rannadenn kevredet", "+ Add trusted server" : "+ Ouzhpenna ur servijour fiziet", "Trusted server" : "Servijour fiziet", - "Add" : "Ouzhpennañ" + "Add" : "Ouzhpennañ", + "Add server automatically once a federated share was created successfully" : "Ouzhpennañ ur servijour en un doare otomatek ur wech krouet mar ar rannadenn kevredet" },"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);" }
\ No newline at end of file diff --git a/apps/federation/l10n/ca.js b/apps/federation/l10n/ca.js index 3f128f7897e..25381ee0e1a 100644 --- a/apps/federation/l10n/ca.js +++ b/apps/federation/l10n/ca.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federació us permet connectar-vos amb altres servidors de confiança per a intercanviar carpetes d'usuari. Per exemple, s'utilitzarà per a proporcionar resultats d'emplenament automàtic d'usuaris externs per a l'ús compartit federat.", "Trusted servers" : "Servidors de confiança", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "La federació us permet connectar-vos amb altres servidors de confiança per a intercanviar carpetes d'usuari. Per exemple, s'utilitzarà per a proporcionar resultats d'emplenament automàtic d'usuaris externs per a l'ús compartit federat. No cal afegir un servidor com a servidor de confiança per a crear un recurs d'ús compartit federat.", - "Add server automatically once a federated share was created successfully" : "Afegeix un servidor automàticament quan es creï un recurs d'ús compartit federat correctament", "+ Add trusted server" : "+ Afegeix un servidor de confiança", "Trusted server" : "Servidor de confiança", - "Add" : "Afegeix" + "Add" : "Afegeix", + "Add server automatically once a federated share was created successfully" : "Afegeix un servidor automàticament quan es creï un recurs d'ús compartit federat correctament" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/ca.json b/apps/federation/l10n/ca.json index b209c4624d9..834b45a1f8a 100644 --- a/apps/federation/l10n/ca.json +++ b/apps/federation/l10n/ca.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federació us permet connectar-vos amb altres servidors de confiança per a intercanviar carpetes d'usuari. Per exemple, s'utilitzarà per a proporcionar resultats d'emplenament automàtic d'usuaris externs per a l'ús compartit federat.", "Trusted servers" : "Servidors de confiança", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "La federació us permet connectar-vos amb altres servidors de confiança per a intercanviar carpetes d'usuari. Per exemple, s'utilitzarà per a proporcionar resultats d'emplenament automàtic d'usuaris externs per a l'ús compartit federat. No cal afegir un servidor com a servidor de confiança per a crear un recurs d'ús compartit federat.", - "Add server automatically once a federated share was created successfully" : "Afegeix un servidor automàticament quan es creï un recurs d'ús compartit federat correctament", "+ Add trusted server" : "+ Afegeix un servidor de confiança", "Trusted server" : "Servidor de confiança", - "Add" : "Afegeix" + "Add" : "Afegeix", + "Add server automatically once a federated share was created successfully" : "Afegeix un servidor automàticament quan es creï un recurs d'ús compartit federat correctament" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/cs.js b/apps/federation/l10n/cs.js index 050021aa540..e3bc5a5e4fb 100644 --- a/apps/federation/l10n/cs.js +++ b/apps/federation/l10n/cs.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federování umožňuje propojit s ostatními servery, kterým věříte a vyměňovat si tak adresář uživatelů. Používá se to např. pro automatické doplňování uživatelů při federovaném sdílení.", "Trusted servers" : "Důvěryhodné servery", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federování vám umožní se spojovat s dalšími důvěryhodnými servery a sdílet tak uživatelské účty. Například bude toto využito při automatickém dokončování externích uživatelů pro federované sdílení. K vytvoření federovaného sdílení není nezbytné přidávat server jako důvěryhodný.", - "Add server automatically once a federated share was created successfully" : "Po úspěšném vytvoření federovaného sdílení automaticky přidat server", "+ Add trusted server" : "+ Přidat důvěryhodný server", "Trusted server" : "Důvěryhodný server", - "Add" : "Přidat" + "Add" : "Přidat", + "Add server automatically once a federated share was created successfully" : "Po úspěšném vytvoření federovaného sdílení automaticky přidat server" }, "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"); diff --git a/apps/federation/l10n/cs.json b/apps/federation/l10n/cs.json index 8aeac272861..33a53f31dd5 100644 --- a/apps/federation/l10n/cs.json +++ b/apps/federation/l10n/cs.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federování umožňuje propojit s ostatními servery, kterým věříte a vyměňovat si tak adresář uživatelů. Používá se to např. pro automatické doplňování uživatelů při federovaném sdílení.", "Trusted servers" : "Důvěryhodné servery", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federování vám umožní se spojovat s dalšími důvěryhodnými servery a sdílet tak uživatelské účty. Například bude toto využito při automatickém dokončování externích uživatelů pro federované sdílení. K vytvoření federovaného sdílení není nezbytné přidávat server jako důvěryhodný.", - "Add server automatically once a federated share was created successfully" : "Po úspěšném vytvoření federovaného sdílení automaticky přidat server", "+ Add trusted server" : "+ Přidat důvěryhodný server", "Trusted server" : "Důvěryhodný server", - "Add" : "Přidat" + "Add" : "Přidat", + "Add server automatically once a federated share was created successfully" : "Po úspěšném vytvoření federovaného sdílení automaticky přidat server" },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;" }
\ No newline at end of file diff --git a/apps/federation/l10n/da.js b/apps/federation/l10n/da.js index 3c5f8bf4798..8a8237f3804 100644 --- a/apps/federation/l10n/da.js +++ b/apps/federation/l10n/da.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation gør dig i stand til at forbinde med andre serveren du stoler på og udveksle brugerdatabaser. F. eks. dette kan blive bruge til at auto complete eksterne brugere når du laver federated deling.", "Trusted servers" : "Pålidelige servere", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federation giver dig mulighed for at oprette forbindelse til andre betroede servere for at udveksle brugerkataloget. For eksempel vil dette blive brugt til automatisk at udfylde eksterne brugere til fødereret deling. Det er ikke nødvendigt at tilføje en server som betroet server for at oprette en sammensat deling.", - "Add server automatically once a federated share was created successfully" : "Tilføj serveren automatisk, når et datafællesskab er oprettet ", "+ Add trusted server" : "+ Tilføj pålidelig server", "Trusted server" : "Pålidelig server", - "Add" : "Tilføj" + "Add" : "Tilføj", + "Add server automatically once a federated share was created successfully" : "Tilføj serveren automatisk, når et datafællesskab er oprettet " }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/da.json b/apps/federation/l10n/da.json index f75d70b9d92..34703528f22 100644 --- a/apps/federation/l10n/da.json +++ b/apps/federation/l10n/da.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation gør dig i stand til at forbinde med andre serveren du stoler på og udveksle brugerdatabaser. F. eks. dette kan blive bruge til at auto complete eksterne brugere når du laver federated deling.", "Trusted servers" : "Pålidelige servere", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federation giver dig mulighed for at oprette forbindelse til andre betroede servere for at udveksle brugerkataloget. For eksempel vil dette blive brugt til automatisk at udfylde eksterne brugere til fødereret deling. Det er ikke nødvendigt at tilføje en server som betroet server for at oprette en sammensat deling.", - "Add server automatically once a federated share was created successfully" : "Tilføj serveren automatisk, når et datafællesskab er oprettet ", "+ Add trusted server" : "+ Tilføj pålidelig server", "Trusted server" : "Pålidelig server", - "Add" : "Tilføj" + "Add" : "Tilføj", + "Add server automatically once a federated share was created successfully" : "Tilføj serveren automatisk, når et datafællesskab er oprettet " },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/de.js b/apps/federation/l10n/de.js index 982649282a0..73adcc82b8c 100644 --- a/apps/federation/l10n/de.js +++ b/apps/federation/l10n/de.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Dir, Dich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet.", "Trusted servers" : "Vertrauenswürdige Server", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federation ermöglicht es Dir, Dich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet. Es ist nicht erforderlich einen Server als vertrauenswürdig hinzuzufügen, um eine \"federated\" Freigabe zu erstellen.", - "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde", "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen", "Trusted server" : "Vertrauenswürdiger Server", - "Add" : "Hinzufügen" + "Add" : "Hinzufügen", + "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/de.json b/apps/federation/l10n/de.json index 3ecc2f3fb9b..1a29d6c9dd5 100644 --- a/apps/federation/l10n/de.json +++ b/apps/federation/l10n/de.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Dir, Dich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet.", "Trusted servers" : "Vertrauenswürdige Server", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federation ermöglicht es Dir, Dich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet. Es ist nicht erforderlich einen Server als vertrauenswürdig hinzuzufügen, um eine \"federated\" Freigabe zu erstellen.", - "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde", "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen", "Trusted server" : "Vertrauenswürdiger Server", - "Add" : "Hinzufügen" + "Add" : "Hinzufügen", + "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/de_DE.js b/apps/federation/l10n/de_DE.js index 76eb9be4496..73b5b2ef1c1 100644 --- a/apps/federation/l10n/de_DE.js +++ b/apps/federation/l10n/de_DE.js @@ -6,13 +6,13 @@ OC.L10N.register( "No server to federate with found" : "Es wurde kein Server zum Verbinden per Federation gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federation ermöglicht die Verbindung mit anderen vertrauenswürdigen Servern um das Nutzerverzeichnis auszutauschen.", + "Federation allows you to connect with other trusted servers to exchange the user directory." : "Föderation ermöglicht die Verbindung mit anderen vertrauenswürdigen Servern, um das Benutzerverzeichnis auszutauschen.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Ihnen, sich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet.", "Trusted servers" : "Vertrauenswürdige Server", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federation ermöglicht es Ihnen, sich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet. Es ist nicht erforderlich einen Server als vertrauenswürdig hinzuzufügen, um eine \"federated\" Freigabe zu erstellen.", - "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde", "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen", "Trusted server" : "Vertrauenswürdiger Server", - "Add" : "Hinzufügen" + "Add" : "Hinzufügen", + "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/de_DE.json b/apps/federation/l10n/de_DE.json index 95e58d04b1d..a2706df668d 100644 --- a/apps/federation/l10n/de_DE.json +++ b/apps/federation/l10n/de_DE.json @@ -4,13 +4,13 @@ "No server to federate with found" : "Es wurde kein Server zum Verbinden per Federation gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federation ermöglicht die Verbindung mit anderen vertrauenswürdigen Servern um das Nutzerverzeichnis auszutauschen.", + "Federation allows you to connect with other trusted servers to exchange the user directory." : "Föderation ermöglicht die Verbindung mit anderen vertrauenswürdigen Servern, um das Benutzerverzeichnis auszutauschen.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Ihnen, sich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet.", "Trusted servers" : "Vertrauenswürdige Server", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federation ermöglicht es Ihnen, sich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet. Es ist nicht erforderlich einen Server als vertrauenswürdig hinzuzufügen, um eine \"federated\" Freigabe zu erstellen.", - "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde", "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen", "Trusted server" : "Vertrauenswürdiger Server", - "Add" : "Hinzufügen" + "Add" : "Hinzufügen", + "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/el.js b/apps/federation/l10n/el.js index 5e51237223d..6b25cc794d1 100644 --- a/apps/federation/l10n/el.js +++ b/apps/federation/l10n/el.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Το Federation σας επιτρέπει να συνδεθείτε με άλλους αξιόπιστους διακομιστές για να ανταλλάξετε τον κατάλογο χρηστών. Για παράδειγμα, αυτό θα χρησιμοποιηθεί για την αυτόματη συμπλήρωση εξωτερικών χρηστών για ομαδική κοινή χρήση.", "Trusted servers" : "Έμπιστοι διακομιστές", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Το Federation σας επιτρέπει να συνδεθείτε με άλλους αξιόπιστους διακομιστές για να ανταλλάξετε τον κατάλογο χρηστών. Για παράδειγμα, αυτό θα χρησιμοποιηθεί για την αυτόματη συμπλήρωση εξωτερικών χρηστών για ομαδική κοινή χρήση. Δεν είναι απαραίτητο να προσθέσετε έναν διακομιστή ως αξιόπιστο για να δημιουργήσετε ένα κοινόχρηστο μεταξύ τους στοιχείο.", - "Add server automatically once a federated share was created successfully" : "Προσθέστε αυτόματα το διακομιστή μόλις δημιουργηθεί με επιτυχία μια faderated κοινή χρήση", "+ Add trusted server" : "+Προσθήκη έμπιστων διακομιστών", "Trusted server" : "Έμπιστοι διακομιστές", - "Add" : "Προσθήκη" + "Add" : "Προσθήκη", + "Add server automatically once a federated share was created successfully" : "Προσθέστε αυτόματα το διακομιστή μόλις δημιουργηθεί με επιτυχία μια faderated κοινή χρήση" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/el.json b/apps/federation/l10n/el.json index e64822f8dca..94d91e2c0f3 100644 --- a/apps/federation/l10n/el.json +++ b/apps/federation/l10n/el.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Το Federation σας επιτρέπει να συνδεθείτε με άλλους αξιόπιστους διακομιστές για να ανταλλάξετε τον κατάλογο χρηστών. Για παράδειγμα, αυτό θα χρησιμοποιηθεί για την αυτόματη συμπλήρωση εξωτερικών χρηστών για ομαδική κοινή χρήση.", "Trusted servers" : "Έμπιστοι διακομιστές", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Το Federation σας επιτρέπει να συνδεθείτε με άλλους αξιόπιστους διακομιστές για να ανταλλάξετε τον κατάλογο χρηστών. Για παράδειγμα, αυτό θα χρησιμοποιηθεί για την αυτόματη συμπλήρωση εξωτερικών χρηστών για ομαδική κοινή χρήση. Δεν είναι απαραίτητο να προσθέσετε έναν διακομιστή ως αξιόπιστο για να δημιουργήσετε ένα κοινόχρηστο μεταξύ τους στοιχείο.", - "Add server automatically once a federated share was created successfully" : "Προσθέστε αυτόματα το διακομιστή μόλις δημιουργηθεί με επιτυχία μια faderated κοινή χρήση", "+ Add trusted server" : "+Προσθήκη έμπιστων διακομιστών", "Trusted server" : "Έμπιστοι διακομιστές", - "Add" : "Προσθήκη" + "Add" : "Προσθήκη", + "Add server automatically once a federated share was created successfully" : "Προσθέστε αυτόματα το διακομιστή μόλις δημιουργηθεί με επιτυχία μια faderated κοινή χρήση" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/en_GB.js b/apps/federation/l10n/en_GB.js index 138a925113d..42dd9c2caa2 100644 --- a/apps/federation/l10n/en_GB.js +++ b/apps/federation/l10n/en_GB.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation allows you to connect with other trusted servers to exchange the user directory. For example: to auto-complete external users for federated sharing.", "Trusted servers" : "Trusted servers", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share.", - "Add server automatically once a federated share was created successfully" : "Automatically add server once a federated share is successfully created", "+ Add trusted server" : "+ Add trusted server", "Trusted server" : "Trusted server", - "Add" : "Add" + "Add" : "Add", + "Add server automatically once a federated share was created successfully" : "Automatically add server once a federated share is successfully created" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/en_GB.json b/apps/federation/l10n/en_GB.json index 2e3d389fef3..f1e0a33b0d6 100644 --- a/apps/federation/l10n/en_GB.json +++ b/apps/federation/l10n/en_GB.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation allows you to connect with other trusted servers to exchange the user directory. For example: to auto-complete external users for federated sharing.", "Trusted servers" : "Trusted servers", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share.", - "Add server automatically once a federated share was created successfully" : "Automatically add server once a federated share is successfully created", "+ Add trusted server" : "+ Add trusted server", "Trusted server" : "Trusted server", - "Add" : "Add" + "Add" : "Add", + "Add server automatically once a federated share was created successfully" : "Automatically add server once a federated share is successfully created" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/eo.js b/apps/federation/l10n/eo.js index d53894b48c9..132201443a1 100644 --- a/apps/federation/l10n/eo.js +++ b/apps/federation/l10n/eo.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "„Federado“ ebligas vin konekti al aliaj fidindaj serviloj por interŝanĝi liston de uzantoj.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "„Federado“ ebligas vin konekti al aliaj fidindaj serviloj por interŝanĝi liston de uzantoj. Ekzemple, tio uziĝos por aŭtomate kompletigi forajn uzantojn en federa kunhavigo.", "Trusted servers" : "Fidindaj serviloj", - "Add server automatically once a federated share was created successfully" : "Aldoni servilon aŭtomate, kiam federa kunhavo sukcese kreiĝis", "+ Add trusted server" : "+ Aldoni fidindan servilon", "Trusted server" : "Fidinda servilo", - "Add" : "Aldoni" + "Add" : "Aldoni", + "Add server automatically once a federated share was created successfully" : "Aldoni servilon aŭtomate, kiam federa kunhavo sukcese kreiĝis" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/eo.json b/apps/federation/l10n/eo.json index ceebe189415..8e627ead33c 100644 --- a/apps/federation/l10n/eo.json +++ b/apps/federation/l10n/eo.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "„Federado“ ebligas vin konekti al aliaj fidindaj serviloj por interŝanĝi liston de uzantoj.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "„Federado“ ebligas vin konekti al aliaj fidindaj serviloj por interŝanĝi liston de uzantoj. Ekzemple, tio uziĝos por aŭtomate kompletigi forajn uzantojn en federa kunhavigo.", "Trusted servers" : "Fidindaj serviloj", - "Add server automatically once a federated share was created successfully" : "Aldoni servilon aŭtomate, kiam federa kunhavo sukcese kreiĝis", "+ Add trusted server" : "+ Aldoni fidindan servilon", "Trusted server" : "Fidinda servilo", - "Add" : "Aldoni" + "Add" : "Aldoni", + "Add server automatically once a federated share was created successfully" : "Aldoni servilon aŭtomate, kiam federa kunhavo sukcese kreiĝis" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es.js b/apps/federation/l10n/es.js index e85cde39267..713c19658e8 100644 --- a/apps/federation/l10n/es.js +++ b/apps/federation/l10n/es.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación permite conectarte con otros servidores de confianza para intercambiar directorios. Por ejemplo, esto se usará para autocompletar la selección de usuarios externos al compartir en federación.", "Trusted servers" : "Servidores de confianza", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "La Federación le permite conectarse con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se utilizará para autocompletar a los usuarios externos para el intercambio federado. No es necesario añadir un servidor como servidor de confianza para crear una recurso compartido federado.", - "Add server automatically once a federated share was created successfully" : "Añadir el servidor automáticamente una vez que un compartido federado se haya creado exitosamente", "+ Add trusted server" : "+ Añadir servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Añadir" + "Add" : "Añadir", + "Add server automatically once a federated share was created successfully" : "Añadir el servidor automáticamente una vez que un compartido federado se haya creado exitosamente" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es.json b/apps/federation/l10n/es.json index ed4b450b916..09fcbd7e26e 100644 --- a/apps/federation/l10n/es.json +++ b/apps/federation/l10n/es.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación permite conectarte con otros servidores de confianza para intercambiar directorios. Por ejemplo, esto se usará para autocompletar la selección de usuarios externos al compartir en federación.", "Trusted servers" : "Servidores de confianza", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "La Federación le permite conectarse con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se utilizará para autocompletar a los usuarios externos para el intercambio federado. No es necesario añadir un servidor como servidor de confianza para crear una recurso compartido federado.", - "Add server automatically once a federated share was created successfully" : "Añadir el servidor automáticamente una vez que un compartido federado se haya creado exitosamente", "+ Add trusted server" : "+ Añadir servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Añadir" + "Add" : "Añadir", + "Add server automatically once a federated share was created successfully" : "Añadir el servidor automáticamente una vez que un compartido federado se haya creado exitosamente" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_419.js b/apps/federation/l10n/es_419.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_419.js +++ b/apps/federation/l10n/es_419.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_419.json b/apps/federation/l10n/es_419.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_419.json +++ b/apps/federation/l10n/es_419.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_AR.js b/apps/federation/l10n/es_AR.js index 0b038eb4e93..669e071721b 100644 --- a/apps/federation/l10n/es_AR.js +++ b/apps/federation/l10n/es_AR.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación le permite conectarse con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_AR.json b/apps/federation/l10n/es_AR.json index 0261bb14906..1c708d9a397 100644 --- a/apps/federation/l10n/es_AR.json +++ b/apps/federation/l10n/es_AR.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación le permite conectarse con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_CL.js b/apps/federation/l10n/es_CL.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_CL.js +++ b/apps/federation/l10n/es_CL.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_CL.json b/apps/federation/l10n/es_CL.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_CL.json +++ b/apps/federation/l10n/es_CL.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_CO.js b/apps/federation/l10n/es_CO.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_CO.js +++ b/apps/federation/l10n/es_CO.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_CO.json b/apps/federation/l10n/es_CO.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_CO.json +++ b/apps/federation/l10n/es_CO.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_CR.js b/apps/federation/l10n/es_CR.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_CR.js +++ b/apps/federation/l10n/es_CR.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_CR.json b/apps/federation/l10n/es_CR.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_CR.json +++ b/apps/federation/l10n/es_CR.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_DO.js b/apps/federation/l10n/es_DO.js index 5f25be5740c..c276f192006 100644 --- a/apps/federation/l10n/es_DO.js +++ b/apps/federation/l10n/es_DO.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "La federación le permite conectarse con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se utilizará para autocompletar usuarios externos para uso compartido federado. No es necesario agregar un servidor como servidor de confianza para crear un recurso compartido federado.", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_DO.json b/apps/federation/l10n/es_DO.json index bb0f50ca683..6c1b5fc5ec6 100644 --- a/apps/federation/l10n/es_DO.json +++ b/apps/federation/l10n/es_DO.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "La federación le permite conectarse con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se utilizará para autocompletar usuarios externos para uso compartido federado. No es necesario agregar un servidor como servidor de confianza para crear un recurso compartido federado.", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_EC.js b/apps/federation/l10n/es_EC.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_EC.js +++ b/apps/federation/l10n/es_EC.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_EC.json b/apps/federation/l10n/es_EC.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_EC.json +++ b/apps/federation/l10n/es_EC.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_GT.js b/apps/federation/l10n/es_GT.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_GT.js +++ b/apps/federation/l10n/es_GT.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_GT.json b/apps/federation/l10n/es_GT.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_GT.json +++ b/apps/federation/l10n/es_GT.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_HN.js b/apps/federation/l10n/es_HN.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_HN.js +++ b/apps/federation/l10n/es_HN.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_HN.json b/apps/federation/l10n/es_HN.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_HN.json +++ b/apps/federation/l10n/es_HN.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_MX.js b/apps/federation/l10n/es_MX.js index 3b46b8bb2dd..1a9f38ed706 100644 --- a/apps/federation/l10n/es_MX.js +++ b/apps/federation/l10n/es_MX.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "La Federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_MX.json b/apps/federation/l10n/es_MX.json index f42fb9cda4a..18b092d0c96 100644 --- a/apps/federation/l10n/es_MX.json +++ b/apps/federation/l10n/es_MX.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "La Federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_NI.js b/apps/federation/l10n/es_NI.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_NI.js +++ b/apps/federation/l10n/es_NI.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_NI.json b/apps/federation/l10n/es_NI.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_NI.json +++ b/apps/federation/l10n/es_NI.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_PA.js b/apps/federation/l10n/es_PA.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_PA.js +++ b/apps/federation/l10n/es_PA.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_PA.json b/apps/federation/l10n/es_PA.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_PA.json +++ b/apps/federation/l10n/es_PA.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_PE.js b/apps/federation/l10n/es_PE.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_PE.js +++ b/apps/federation/l10n/es_PE.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_PE.json b/apps/federation/l10n/es_PE.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_PE.json +++ b/apps/federation/l10n/es_PE.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_PR.js b/apps/federation/l10n/es_PR.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_PR.js +++ b/apps/federation/l10n/es_PR.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_PR.json b/apps/federation/l10n/es_PR.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_PR.json +++ b/apps/federation/l10n/es_PR.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_PY.js b/apps/federation/l10n/es_PY.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_PY.js +++ b/apps/federation/l10n/es_PY.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_PY.json b/apps/federation/l10n/es_PY.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_PY.json +++ b/apps/federation/l10n/es_PY.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_SV.js b/apps/federation/l10n/es_SV.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_SV.js +++ b/apps/federation/l10n/es_SV.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_SV.json b/apps/federation/l10n/es_SV.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_SV.json +++ b/apps/federation/l10n/es_SV.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/es_UY.js b/apps/federation/l10n/es_UY.js index 97516618355..03e99d2d883 100644 --- a/apps/federation/l10n/es_UY.js +++ b/apps/federation/l10n/es_UY.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_UY.json b/apps/federation/l10n/es_UY.json index 0a62a6863c5..11e376cdf75 100644 --- a/apps/federation/l10n/es_UY.json +++ b/apps/federation/l10n/es_UY.json @@ -6,9 +6,9 @@ "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar el directorio de usuarios. Por ejemplo, esto se usará para auto-completar usuarios externos en el recurso compartido federado.", "Trusted servers" : "Servidores de confianza", - "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Add server automatically once a federated share was created successfully" : "Agregar el servidor automáticamente una vez que se genere exitosamente el elemento compartido federado" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/et_EE.js b/apps/federation/l10n/et_EE.js index 73ac260f4bd..ead7549d946 100644 --- a/apps/federation/l10n/et_EE.js +++ b/apps/federation/l10n/et_EE.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Liit", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Liitumine lubab sul ühenduse luua teiste usaldusväärsete serveritega, et kasutajaid jagada. Näiteks saab seda rakendada liitunud serverite väliste kasutajanimede automaatseks täitmiseks.", "Trusted servers" : "Usaldatud serverid", - "Add server automatically once a federated share was created successfully" : "Lisa server automaatselt niipea kui liitjagamine õnnestus", "+ Add trusted server" : "+ Lisa usaldatud server", "Trusted server" : "Usaldatud server", - "Add" : "Lisa" + "Add" : "Lisa", + "Add server automatically once a federated share was created successfully" : "Lisa server automaatselt niipea kui liitjagamine õnnestus" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/et_EE.json b/apps/federation/l10n/et_EE.json index cb71e6a09d1..05f6fc3e963 100644 --- a/apps/federation/l10n/et_EE.json +++ b/apps/federation/l10n/et_EE.json @@ -6,9 +6,9 @@ "Federation" : "Liit", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Liitumine lubab sul ühenduse luua teiste usaldusväärsete serveritega, et kasutajaid jagada. Näiteks saab seda rakendada liitunud serverite väliste kasutajanimede automaatseks täitmiseks.", "Trusted servers" : "Usaldatud serverid", - "Add server automatically once a federated share was created successfully" : "Lisa server automaatselt niipea kui liitjagamine õnnestus", "+ Add trusted server" : "+ Lisa usaldatud server", "Trusted server" : "Usaldatud server", - "Add" : "Lisa" + "Add" : "Lisa", + "Add server automatically once a federated share was created successfully" : "Lisa server automaatselt niipea kui liitjagamine õnnestus" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/eu.js b/apps/federation/l10n/eu.js index e4e1fed791f..fe587ccf323 100644 --- a/apps/federation/l10n/eu.js +++ b/apps/federation/l10n/eu.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federazioaren bidez fidagarriak diren zerbitzariekin erabiltzaileen direktorioa trukatzeko aukera dago. Adibidez, kanpo erabiltzaileak automatikoki betetzeko erabil daiteke, federatze partekatuan. ", "Trusted servers" : "Zerbitzari fidagarriak", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federazioaren bidez fidagarriak diren zerbitzariekin erabiltzaile-direktorioa trukatzeko aukera dago. Adibidez, kanpo erabiltzaileak automatikoki betetzeko erabil daiteke, federatze partekatuan. Federatze partekatua egiteko ez da beharrezkoa zerbitzari bat gehitzea zerbitzari fidagarri gisa.", - "Add server automatically once a federated share was created successfully" : "Zerbitzaria automatikoki gehitu federatutako partekatze bat ondo sortzen denean", "+ Add trusted server" : "+ Zerbitzari fidagarria gehitu", "Trusted server" : "Zerbitzari fidagarria", - "Add" : "Gehitu" + "Add" : "Gehitu", + "Add server automatically once a federated share was created successfully" : "Zerbitzaria automatikoki gehitu federatutako partekatze bat ondo sortzen denean" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/eu.json b/apps/federation/l10n/eu.json index 048ed40b6cd..884e3aad977 100644 --- a/apps/federation/l10n/eu.json +++ b/apps/federation/l10n/eu.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federazioaren bidez fidagarriak diren zerbitzariekin erabiltzaileen direktorioa trukatzeko aukera dago. Adibidez, kanpo erabiltzaileak automatikoki betetzeko erabil daiteke, federatze partekatuan. ", "Trusted servers" : "Zerbitzari fidagarriak", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federazioaren bidez fidagarriak diren zerbitzariekin erabiltzaile-direktorioa trukatzeko aukera dago. Adibidez, kanpo erabiltzaileak automatikoki betetzeko erabil daiteke, federatze partekatuan. Federatze partekatua egiteko ez da beharrezkoa zerbitzari bat gehitzea zerbitzari fidagarri gisa.", - "Add server automatically once a federated share was created successfully" : "Zerbitzaria automatikoki gehitu federatutako partekatze bat ondo sortzen denean", "+ Add trusted server" : "+ Zerbitzari fidagarria gehitu", "Trusted server" : "Zerbitzari fidagarria", - "Add" : "Gehitu" + "Add" : "Gehitu", + "Add server automatically once a federated share was created successfully" : "Zerbitzaria automatikoki gehitu federatutako partekatze bat ondo sortzen denean" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/fi.js b/apps/federation/l10n/fi.js index 1fea1a578fb..9be49a54e64 100644 --- a/apps/federation/l10n/fi.js +++ b/apps/federation/l10n/fi.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federaatio mahdollistaa yhdistämisen muihin luotettuihin palvelimiin ja siten käyttäjähakemiston vaihtamisen.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjähakemistoihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.", "Trusted servers" : "Luotetut palvelimet", - "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti", "+ Add trusted server" : "+ Lisää luotettu palvelin", "Trusted server" : "Luotettu palvelin", - "Add" : "Lisää" + "Add" : "Lisää", + "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/fi.json b/apps/federation/l10n/fi.json index 11dd578fe7b..75e6207479a 100644 --- a/apps/federation/l10n/fi.json +++ b/apps/federation/l10n/fi.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federaatio mahdollistaa yhdistämisen muihin luotettuihin palvelimiin ja siten käyttäjähakemiston vaihtamisen.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjähakemistoihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.", "Trusted servers" : "Luotetut palvelimet", - "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti", "+ Add trusted server" : "+ Lisää luotettu palvelin", "Trusted server" : "Luotettu palvelin", - "Add" : "Lisää" + "Add" : "Lisää", + "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/fr.js b/apps/federation/l10n/fr.js index 44a42519c23..922a03252f8 100644 --- a/apps/federation/l10n/fr.js +++ b/apps/federation/l10n/fr.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Une fédération vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs. Par exemple, ce sera utilisé pour auto-compléter les utilisateurs externes lors du partage fédéré.", "Trusted servers" : "Serveurs de confiance", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Une fédération vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs. Par exemple, ce sera utilisé pour auto-compléter les utilisateurs externes lors du partage fédéré. Il n'est pas nécessaire d'ajouter un serveur comme serveur de confiance afin de créer un partage fédéré.", - "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créé avec succès", "+ Add trusted server" : "+ Ajouter un serveur de confiance", "Trusted server" : "Serveur de confiance", - "Add" : "Ajouter" + "Add" : "Ajouter", + "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créé avec succès" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/fr.json b/apps/federation/l10n/fr.json index 6c81cee74ab..14d953eba6d 100644 --- a/apps/federation/l10n/fr.json +++ b/apps/federation/l10n/fr.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Une fédération vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs. Par exemple, ce sera utilisé pour auto-compléter les utilisateurs externes lors du partage fédéré.", "Trusted servers" : "Serveurs de confiance", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Une fédération vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs. Par exemple, ce sera utilisé pour auto-compléter les utilisateurs externes lors du partage fédéré. Il n'est pas nécessaire d'ajouter un serveur comme serveur de confiance afin de créer un partage fédéré.", - "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créé avec succès", "+ Add trusted server" : "+ Ajouter un serveur de confiance", "Trusted server" : "Serveur de confiance", - "Add" : "Ajouter" + "Add" : "Ajouter", + "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créé avec succès" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/gl.js b/apps/federation/l10n/gl.js index 0262f401dde..27b123f5543 100644 --- a/apps/federation/l10n/gl.js +++ b/apps/federation/l10n/gl.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A federación permítelle conectarse con outros servidores de confianza para intercambiar directorios de usuario. Por exemplo, isto usarase para autocompletar a selección de usuarios externos ao compartir en federación. ", "Trusted servers" : "Servidores de confianza", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "A federación permítelle conectarse con outros servidores de confianza para intercambiar directorios de usuario. Por exemplo, isto usarase para autocompletar a selección de usuarios externos ao compartir en federación. Non é necesario engadir un servidor como servidor de confianza para poder crear unha compartición federada.", - "Add server automatically once a federated share was created successfully" : "Engadir o servidor automaticamente una vez que se teña creado satisfactoriamente un compartido federado ", "+ Add trusted server" : "+ Engadir servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Engadir" + "Add" : "Engadir", + "Add server automatically once a federated share was created successfully" : "Engadir o servidor automaticamente una vez que se teña creado satisfactoriamente un compartido federado " }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/gl.json b/apps/federation/l10n/gl.json index 6b7f3955337..fe0e628cce5 100644 --- a/apps/federation/l10n/gl.json +++ b/apps/federation/l10n/gl.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A federación permítelle conectarse con outros servidores de confianza para intercambiar directorios de usuario. Por exemplo, isto usarase para autocompletar a selección de usuarios externos ao compartir en federación. ", "Trusted servers" : "Servidores de confianza", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "A federación permítelle conectarse con outros servidores de confianza para intercambiar directorios de usuario. Por exemplo, isto usarase para autocompletar a selección de usuarios externos ao compartir en federación. Non é necesario engadir un servidor como servidor de confianza para poder crear unha compartición federada.", - "Add server automatically once a federated share was created successfully" : "Engadir o servidor automaticamente una vez que se teña creado satisfactoriamente un compartido federado ", "+ Add trusted server" : "+ Engadir servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Engadir" + "Add" : "Engadir", + "Add server automatically once a federated share was created successfully" : "Engadir o servidor automaticamente una vez que se teña creado satisfactoriamente un compartido federado " },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/he.js b/apps/federation/l10n/he.js index 5def9b96c1d..1fcba1e89f9 100644 --- a/apps/federation/l10n/he.js +++ b/apps/federation/l10n/he.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "איגוד מאפשר לך להתחבר לשרתים מהימנים אחרים כדי להחליף ביניהם את ספריית המשתמש.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "איגוד מאפשר לך להתחבר לשרתים מהימנים אחרים כדי להחליף ביניהם את ספריית המשתמש. למשל: ייעשה שימוש באיגוד לטובת השלמה אוטומטית של משתמשים חיצוניים לשיתוף מאוגד.", "Trusted servers" : "שרתים מהימנים", - "Add server automatically once a federated share was created successfully" : "הוספת שרת באופן אוטומטי לאחר יצירת שרת מאוגד", "+ Add trusted server" : "+ הוספת שרת מהימן", "Trusted server" : "שרת מהימן", - "Add" : "הוספה" + "Add" : "הוספה", + "Add server automatically once a federated share was created successfully" : "הוספת שרת באופן אוטומטי לאחר יצירת שרת מאוגד" }, "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"); diff --git a/apps/federation/l10n/he.json b/apps/federation/l10n/he.json index 7be0f41d067..310a82292c2 100644 --- a/apps/federation/l10n/he.json +++ b/apps/federation/l10n/he.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "איגוד מאפשר לך להתחבר לשרתים מהימנים אחרים כדי להחליף ביניהם את ספריית המשתמש.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "איגוד מאפשר לך להתחבר לשרתים מהימנים אחרים כדי להחליף ביניהם את ספריית המשתמש. למשל: ייעשה שימוש באיגוד לטובת השלמה אוטומטית של משתמשים חיצוניים לשיתוף מאוגד.", "Trusted servers" : "שרתים מהימנים", - "Add server automatically once a federated share was created successfully" : "הוספת שרת באופן אוטומטי לאחר יצירת שרת מאוגד", "+ Add trusted server" : "+ הוספת שרת מהימן", "Trusted server" : "שרת מהימן", - "Add" : "הוספה" + "Add" : "הוספה", + "Add server automatically once a federated share was created successfully" : "הוספת שרת באופן אוטומטי לאחר יצירת שרת מאוגד" },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;" }
\ No newline at end of file diff --git a/apps/federation/l10n/hr.js b/apps/federation/l10n/hr.js index 26e9bc384c4..49a564d83d4 100644 --- a/apps/federation/l10n/hr.js +++ b/apps/federation/l10n/hr.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Udruženje vam omogućuje povezivanje s drugim pouzdanim poslužiteljima i razmjenu korisničkih imenika. Primjerice, može se koristiti za automatsko dovršavanje imena vanjskih korisnika za udruženo dijeljenje.", "Trusted servers" : "Pouzdani poslužitelji", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Udruženje vam omogućuje povezivanje s drugim pouzdanim poslužiteljima i razmjenu korisničkih imenika. Primjerice, može se upotrijebiti za automatsko dovršavanje imena vanjskih korisnika za udruženo dijeljenje. Za stvaranje udruženog dijeljenja nije potrebno dodati poslužitelj kao pouzdani poslužitelj.", - "Add server automatically once a federated share was created successfully" : "Dodaj poslužitelj automatski nakon što je uspješno stvoreno udruženo dijeljenje", "+ Add trusted server" : "+ Dodaj pouzdani poslužitelj", "Trusted server" : "Pouzdan poslužitelj", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Add server automatically once a federated share was created successfully" : "Dodaj poslužitelj automatski nakon što je uspješno stvoreno udruženo dijeljenje" }, "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"); diff --git a/apps/federation/l10n/hr.json b/apps/federation/l10n/hr.json index bf8320eba95..3800dd5e7eb 100644 --- a/apps/federation/l10n/hr.json +++ b/apps/federation/l10n/hr.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Udruženje vam omogućuje povezivanje s drugim pouzdanim poslužiteljima i razmjenu korisničkih imenika. Primjerice, može se koristiti za automatsko dovršavanje imena vanjskih korisnika za udruženo dijeljenje.", "Trusted servers" : "Pouzdani poslužitelji", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Udruženje vam omogućuje povezivanje s drugim pouzdanim poslužiteljima i razmjenu korisničkih imenika. Primjerice, može se upotrijebiti za automatsko dovršavanje imena vanjskih korisnika za udruženo dijeljenje. Za stvaranje udruženog dijeljenja nije potrebno dodati poslužitelj kao pouzdani poslužitelj.", - "Add server automatically once a federated share was created successfully" : "Dodaj poslužitelj automatski nakon što je uspješno stvoreno udruženo dijeljenje", "+ Add trusted server" : "+ Dodaj pouzdani poslužitelj", "Trusted server" : "Pouzdan poslužitelj", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Add server automatically once a federated share was created successfully" : "Dodaj poslužitelj automatski nakon što je uspješno stvoreno udruženo dijeljenje" },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/federation/l10n/hu.js b/apps/federation/l10n/hu.js index 126f3a5ef55..73d3f36a631 100644 --- a/apps/federation/l10n/hu.js +++ b/apps/federation/l10n/hu.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A föderáció lehetővé teszi a más megbízható kiszolgálókhoz kapcsolódást, hogy a kiszolgálók felhasználójegyzéket cseréljenek. Például ennek segítségével lesznek automatikusan kiegészítve a külső felhasználók a föderált megosztásnál.", "Trusted servers" : "Megbízható kiszolgálók", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "A föderáció lehetővé teszi a más megbízható kiszolgálókhoz kapcsolódást, hogy a kiszolgálók felhasználójegyzéket cseréljenek. Például ennek segítségével lesznek automatikusan kiegészítve a külső felhasználók a föderált megosztásnál. Nem szükséges egy kiszolgálót megbízhatóként hozzáadni ahhoz, hogy föderált megosztást hozzon létre.", - "Add server automatically once a federated share was created successfully" : "Kiszolgáló automatikus hozzáadása, ha az egyesített megosztás létrehozása sikeres", "+ Add trusted server" : "+ Megbízható kiszolgáló hozzáadása", "Trusted server" : "Megbízható kiszolgáló", - "Add" : "Hozzáadás" + "Add" : "Hozzáadás", + "Add server automatically once a federated share was created successfully" : "Kiszolgáló automatikus hozzáadása, ha az egyesített megosztás létrehozása sikeres" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/hu.json b/apps/federation/l10n/hu.json index 5898af48fc3..c2ef47b3460 100644 --- a/apps/federation/l10n/hu.json +++ b/apps/federation/l10n/hu.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A föderáció lehetővé teszi a más megbízható kiszolgálókhoz kapcsolódást, hogy a kiszolgálók felhasználójegyzéket cseréljenek. Például ennek segítségével lesznek automatikusan kiegészítve a külső felhasználók a föderált megosztásnál.", "Trusted servers" : "Megbízható kiszolgálók", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "A föderáció lehetővé teszi a más megbízható kiszolgálókhoz kapcsolódást, hogy a kiszolgálók felhasználójegyzéket cseréljenek. Például ennek segítségével lesznek automatikusan kiegészítve a külső felhasználók a föderált megosztásnál. Nem szükséges egy kiszolgálót megbízhatóként hozzáadni ahhoz, hogy föderált megosztást hozzon létre.", - "Add server automatically once a federated share was created successfully" : "Kiszolgáló automatikus hozzáadása, ha az egyesített megosztás létrehozása sikeres", "+ Add trusted server" : "+ Megbízható kiszolgáló hozzáadása", "Trusted server" : "Megbízható kiszolgáló", - "Add" : "Hozzáadás" + "Add" : "Hozzáadás", + "Add server automatically once a federated share was created successfully" : "Kiszolgáló automatikus hozzáadása, ha az egyesített megosztás létrehozása sikeres" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/ia.js b/apps/federation/l10n/ia.js index eb82944073c..c8272637ba8 100644 --- a/apps/federation/l10n/ia.js +++ b/apps/federation/l10n/ia.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federation", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Le federation permitte te connecter con altere servitores fiduciari pro excambiar le directorio del usator. Per exemplo, iste attributo essera usate pro completar automaticamente usatores externe pro le compartimento federate.", "Trusted servers" : "Servitores fiduciari", - "Add server automatically once a federated share was created successfully" : "Le functionalitate de adder un servitor automaticamente un vice que un compartimento federate es associate esseva create con successo", "+ Add trusted server" : "+ Adder servitor fiduciari", "Trusted server" : "Servitor fiduciari", - "Add" : "Adder" + "Add" : "Adder", + "Add server automatically once a federated share was created successfully" : "Le functionalitate de adder un servitor automaticamente un vice que un compartimento federate es associate esseva create con successo" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/ia.json b/apps/federation/l10n/ia.json index 59133de7382..67b7e2200df 100644 --- a/apps/federation/l10n/ia.json +++ b/apps/federation/l10n/ia.json @@ -6,9 +6,9 @@ "Federation" : "Federation", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Le federation permitte te connecter con altere servitores fiduciari pro excambiar le directorio del usator. Per exemplo, iste attributo essera usate pro completar automaticamente usatores externe pro le compartimento federate.", "Trusted servers" : "Servitores fiduciari", - "Add server automatically once a federated share was created successfully" : "Le functionalitate de adder un servitor automaticamente un vice que un compartimento federate es associate esseva create con successo", "+ Add trusted server" : "+ Adder servitor fiduciari", "Trusted server" : "Servitor fiduciari", - "Add" : "Adder" + "Add" : "Adder", + "Add server automatically once a federated share was created successfully" : "Le functionalitate de adder un servitor automaticamente un vice que un compartimento federate es associate esseva create con successo" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/id.js b/apps/federation/l10n/id.js index 8f9d9317cce..93e52985ba0 100644 --- a/apps/federation/l10n/id.js +++ b/apps/federation/l10n/id.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federasi", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi memungkinkan Anda untuk terhubung dengan server lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.", "Trusted servers" : "Server terpercaya", - "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat", "+ Add trusted server" : "+ Tambah server terpercaya", "Trusted server" : "Server terpercaya", - "Add" : "Tambah" + "Add" : "Tambah", + "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/id.json b/apps/federation/l10n/id.json index 312ebac1bb9..c3504aa4e8e 100644 --- a/apps/federation/l10n/id.json +++ b/apps/federation/l10n/id.json @@ -6,9 +6,9 @@ "Federation" : "Federasi", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi memungkinkan Anda untuk terhubung dengan server lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.", "Trusted servers" : "Server terpercaya", - "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat", "+ Add trusted server" : "+ Tambah server terpercaya", "Trusted server" : "Server terpercaya", - "Add" : "Tambah" + "Add" : "Tambah", + "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/l10n/is.js b/apps/federation/l10n/is.js index 52ea64d0168..b9e7d87aa35 100644 --- a/apps/federation/l10n/is.js +++ b/apps/federation/l10n/is.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrum treystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.", "Trusted servers" : "Treystir þjónar", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrum treystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna. Ekki er nauðsynlegt að bæta netþjóni við sem treystum netþjóni til að útbúa sambandssameign (federated share).", - "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign", "+ Add trusted server" : "+ Bæta við treystum þjóni", "Trusted server" : "Treystur þjónn", - "Add" : "Bæta við" + "Add" : "Bæta við", + "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/federation/l10n/is.json b/apps/federation/l10n/is.json index 29c61aa806c..5b275131298 100644 --- a/apps/federation/l10n/is.json +++ b/apps/federation/l10n/is.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrum treystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.", "Trusted servers" : "Treystir þjónar", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrum treystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna. Ekki er nauðsynlegt að bæta netþjóni við sem treystum netþjóni til að útbúa sambandssameign (federated share).", - "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign", "+ Add trusted server" : "+ Bæta við treystum þjóni", "Trusted server" : "Treystur þjónn", - "Add" : "Bæta við" + "Add" : "Bæta við", + "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/federation/l10n/it.js b/apps/federation/l10n/it.js index d60152ccf77..d61556d0102 100644 --- a/apps/federation/l10n/it.js +++ b/apps/federation/l10n/it.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione consente di connettersi ad altri server affidabili per accedere alla cartella utente. Ad esempio, può essere utilizzata per il completamento automatico di utenti esterni per la condivisione federata.", "Trusted servers" : "Server affidabili", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "La federazione ti consente di connetterti ad altri server affidabili per accedere alla cartella utente. Ad esempio, può essere utilizzata per il completamento automatico di utenti esterni per la condivisione federata. Non è necessario aggiungere un server come affidabile per creare una condivisione federata.", - "Add server automatically once a federated share was created successfully" : "Aggiungi automaticamente il server dopo che una condivisione federata è stata creata con successo", "+ Add trusted server" : "+ Aggiungi server affidabile", "Trusted server" : "Server affidabile", - "Add" : "Aggiungi" + "Add" : "Aggiungi", + "Add server automatically once a federated share was created successfully" : "Aggiungi automaticamente il server dopo che una condivisione federata è stata creata con successo" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/it.json b/apps/federation/l10n/it.json index 5857f64ccad..411c09c4eca 100644 --- a/apps/federation/l10n/it.json +++ b/apps/federation/l10n/it.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione consente di connettersi ad altri server affidabili per accedere alla cartella utente. Ad esempio, può essere utilizzata per il completamento automatico di utenti esterni per la condivisione federata.", "Trusted servers" : "Server affidabili", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "La federazione ti consente di connetterti ad altri server affidabili per accedere alla cartella utente. Ad esempio, può essere utilizzata per il completamento automatico di utenti esterni per la condivisione federata. Non è necessario aggiungere un server come affidabile per creare una condivisione federata.", - "Add server automatically once a federated share was created successfully" : "Aggiungi automaticamente il server dopo che una condivisione federata è stata creata con successo", "+ Add trusted server" : "+ Aggiungi server affidabile", "Trusted server" : "Server affidabile", - "Add" : "Aggiungi" + "Add" : "Aggiungi", + "Add server automatically once a federated share was created successfully" : "Aggiungi automaticamente il server dopo che una condivisione federata è stata creata con successo" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/ja.js b/apps/federation/l10n/ja.js index e3e6fd887cb..77793f24deb 100644 --- a/apps/federation/l10n/ja.js +++ b/apps/federation/l10n/ja.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "連携では他の信頼済サーバーとユーザーリストをやり取りすること許可します。例えば、連携共有時で他のサーバーのユーザーのIDを自動補完します。", "Trusted servers" : "信頼済サーバー", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Nextcloud連携では、他の信頼できるサーバーと接続して、ユーザーリストをやりとりすることができます。例えば、これにより他のサーバーのユーザーが連携共有の時に自動的に補完されます。フェデレーション共有を行うときには、信頼できるサーバーとして追加する必要はありません。", - "Add server automatically once a federated share was created successfully" : "連携共有の作成に成功したら自動的にサーバーを追加する", "+ Add trusted server" : "+ 信頼済サーバーに追加", "Trusted server" : "信頼済サーバー", - "Add" : "追加" + "Add" : "追加", + "Add server automatically once a federated share was created successfully" : "連携共有の作成に成功したら自動的にサーバーを追加する" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/ja.json b/apps/federation/l10n/ja.json index 1402a7fbc8e..9a9112a4909 100644 --- a/apps/federation/l10n/ja.json +++ b/apps/federation/l10n/ja.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "連携では他の信頼済サーバーとユーザーリストをやり取りすること許可します。例えば、連携共有時で他のサーバーのユーザーのIDを自動補完します。", "Trusted servers" : "信頼済サーバー", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Nextcloud連携では、他の信頼できるサーバーと接続して、ユーザーリストをやりとりすることができます。例えば、これにより他のサーバーのユーザーが連携共有の時に自動的に補完されます。フェデレーション共有を行うときには、信頼できるサーバーとして追加する必要はありません。", - "Add server automatically once a federated share was created successfully" : "連携共有の作成に成功したら自動的にサーバーを追加する", "+ Add trusted server" : "+ 信頼済サーバーに追加", "Trusted server" : "信頼済サーバー", - "Add" : "追加" + "Add" : "追加", + "Add server automatically once a federated share was created successfully" : "連携共有の作成に成功したら自動的にサーバーを追加する" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/l10n/ka_GE.js b/apps/federation/l10n/ka_GE.js index b75413fe592..be1bf168b28 100644 --- a/apps/federation/l10n/ka_GE.js +++ b/apps/federation/l10n/ka_GE.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "ფედერაცია", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ფედერალიზაცია იძლევა საშუალებას დაუკავშირდეთ სხვა დაცულ სერვერებს და გაცვალოთ მომხმარებლის დირექტორია. მაგალითისთვის ეს გამოყენებულ იქნება, რომ მოხდეს ექსტერნალური მომხმარებლების ფედერალური გაზიარებისთვის ავტო-დასრულება.", "Trusted servers" : "სანდო სერვერები", - "Add server automatically once a federated share was created successfully" : "სერვერის ავტომატურად დამატება, როდესაც ფედერალური გაზიარება წარმატებით შეიქმნება", "+ Add trusted server" : "+ სანდო სერვერის დამატება", "Trusted server" : "სანდო სერვერი", - "Add" : "დამატება" + "Add" : "დამატება", + "Add server automatically once a federated share was created successfully" : "სერვერის ავტომატურად დამატება, როდესაც ფედერალური გაზიარება წარმატებით შეიქმნება" }, "nplurals=2; plural=(n!=1);"); diff --git a/apps/federation/l10n/ka_GE.json b/apps/federation/l10n/ka_GE.json index 1c449f3848d..38ba2e1196e 100644 --- a/apps/federation/l10n/ka_GE.json +++ b/apps/federation/l10n/ka_GE.json @@ -6,9 +6,9 @@ "Federation" : "ფედერაცია", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ფედერალიზაცია იძლევა საშუალებას დაუკავშირდეთ სხვა დაცულ სერვერებს და გაცვალოთ მომხმარებლის დირექტორია. მაგალითისთვის ეს გამოყენებულ იქნება, რომ მოხდეს ექსტერნალური მომხმარებლების ფედერალური გაზიარებისთვის ავტო-დასრულება.", "Trusted servers" : "სანდო სერვერები", - "Add server automatically once a federated share was created successfully" : "სერვერის ავტომატურად დამატება, როდესაც ფედერალური გაზიარება წარმატებით შეიქმნება", "+ Add trusted server" : "+ სანდო სერვერის დამატება", "Trusted server" : "სანდო სერვერი", - "Add" : "დამატება" + "Add" : "დამატება", + "Add server automatically once a federated share was created successfully" : "სერვერის ავტომატურად დამატება, როდესაც ფედერალური გაზიარება წარმატებით შეიქმნება" },"pluralForm" :"nplurals=2; plural=(n!=1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/ko.js b/apps/federation/l10n/ko.js index 6c36c43e9bf..efe87f45ae6 100644 --- a/apps/federation/l10n/ko.js +++ b/apps/federation/l10n/ko.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "서버 연합을 통해서 다른 신뢰할 수 있는 서버와 사용자 디렉터리를 교환할 수 있습니다.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "서버 연합을 통해서 다른 신뢰할 수 있는 서버와 사용자 디렉터리를 교환할 수 있습니다. 이 기능의 사용 예시로 연합 공유 시 외부 사용자를 자동 완성하는 데 사용할 수 있습니다.", "Trusted servers" : "신뢰할 수 있는 서버", - "Add server automatically once a federated share was created successfully" : "연합 공유를 생성했을 때 자동으로 서버 추가", "+ Add trusted server" : "+ 신뢰할 수 있는 서버 추가", "Trusted server" : "신뢰할 수 있는 서버", - "Add" : "추가" + "Add" : "추가", + "Add server automatically once a federated share was created successfully" : "연합 공유를 생성했을 때 자동으로 서버 추가" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/ko.json b/apps/federation/l10n/ko.json index 3d6d5a32698..2f06abb1bd9 100644 --- a/apps/federation/l10n/ko.json +++ b/apps/federation/l10n/ko.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "서버 연합을 통해서 다른 신뢰할 수 있는 서버와 사용자 디렉터리를 교환할 수 있습니다.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "서버 연합을 통해서 다른 신뢰할 수 있는 서버와 사용자 디렉터리를 교환할 수 있습니다. 이 기능의 사용 예시로 연합 공유 시 외부 사용자를 자동 완성하는 데 사용할 수 있습니다.", "Trusted servers" : "신뢰할 수 있는 서버", - "Add server automatically once a federated share was created successfully" : "연합 공유를 생성했을 때 자동으로 서버 추가", "+ Add trusted server" : "+ 신뢰할 수 있는 서버 추가", "Trusted server" : "신뢰할 수 있는 서버", - "Add" : "추가" + "Add" : "추가", + "Add server automatically once a federated share was created successfully" : "연합 공유를 생성했을 때 자동으로 서버 추가" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/l10n/lt_LT.js b/apps/federation/l10n/lt_LT.js index 9fe571d118a..291d99b0c7a 100644 --- a/apps/federation/l10n/lt_LT.js +++ b/apps/federation/l10n/lt_LT.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federacija leidžia jums prisijungti prie kitų patikimų serverių, siekiant keistis naudotojo katalogu. Pavyzdžiui, tai bus naudojama, kad būtų automatiškai užbaigti išoriniai federacinio bendrinimo naudotojų vardai.", "Trusted servers" : "Patikimi serveriai", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Gederacijos paslauga suteikia galimybę prisijungti prie kitų patikimų serverių, kad būtų galima keistis naudotojų katalogu. Pavyzdžiui, tai bus naudojama, kad būtų automatiškai užbaigti išoriniai federacinio bendrinimo naudotojų vardai.", - "Add server automatically once a federated share was created successfully" : "Sėkmingai sukūrus federacinį viešinį, automatiškai pridėti serverį", "+ Add trusted server" : "+ Pridėti patikimą serverį", "Trusted server" : "Patikimas serveris", - "Add" : "Pridėti" + "Add" : "Pridėti", + "Add server automatically once a federated share was created successfully" : "Sėkmingai sukūrus federacinį viešinį, automatiškai pridėti serverį" }, "nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"); diff --git a/apps/federation/l10n/lt_LT.json b/apps/federation/l10n/lt_LT.json index 78c0dc34d72..e47e282c3a0 100644 --- a/apps/federation/l10n/lt_LT.json +++ b/apps/federation/l10n/lt_LT.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federacija leidžia jums prisijungti prie kitų patikimų serverių, siekiant keistis naudotojo katalogu. Pavyzdžiui, tai bus naudojama, kad būtų automatiškai užbaigti išoriniai federacinio bendrinimo naudotojų vardai.", "Trusted servers" : "Patikimi serveriai", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Gederacijos paslauga suteikia galimybę prisijungti prie kitų patikimų serverių, kad būtų galima keistis naudotojų katalogu. Pavyzdžiui, tai bus naudojama, kad būtų automatiškai užbaigti išoriniai federacinio bendrinimo naudotojų vardai.", - "Add server automatically once a federated share was created successfully" : "Sėkmingai sukūrus federacinį viešinį, automatiškai pridėti serverį", "+ Add trusted server" : "+ Pridėti patikimą serverį", "Trusted server" : "Patikimas serveris", - "Add" : "Pridėti" + "Add" : "Pridėti", + "Add server automatically once a federated share was created successfully" : "Sėkmingai sukūrus federacinį viešinį, automatiškai pridėti serverį" },"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);" }
\ No newline at end of file diff --git a/apps/federation/l10n/lv.js b/apps/federation/l10n/lv.js index b28f5fe9234..566f981a495 100644 --- a/apps/federation/l10n/lv.js +++ b/apps/federation/l10n/lv.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federācija ļauj jums sazināties ar citiem uzticamiem serveriem, lai apmainītos ar lietotāju direktoriju.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federācija ļauj savienot ar citiem uzticamiem serveriem ar Exchange lietotāja direktoriju. Piemēram, tas tiks izmantots, lai automātiski pieslēgtu ārējiem lietotājiem integrēto koplietošanu.", "Trusted servers" : "Uzticami serveri", - "Add server automatically once a federated share was created successfully" : "Automātiski pievienots serveris federācijas koplietojumam, veiksmīgi", "+ Add trusted server" : "+ pievietot uzticamiem serveriem", "Trusted server" : "Uzticams serveris", - "Add" : "Pievienot" + "Add" : "Pievienot", + "Add server automatically once a federated share was created successfully" : "Automātiski pievienots serveris federācijas koplietojumam, veiksmīgi" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"); diff --git a/apps/federation/l10n/lv.json b/apps/federation/l10n/lv.json index f159cc3d4ca..4064d1a4b25 100644 --- a/apps/federation/l10n/lv.json +++ b/apps/federation/l10n/lv.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federācija ļauj jums sazināties ar citiem uzticamiem serveriem, lai apmainītos ar lietotāju direktoriju.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federācija ļauj savienot ar citiem uzticamiem serveriem ar Exchange lietotāja direktoriju. Piemēram, tas tiks izmantots, lai automātiski pieslēgtu ārējiem lietotājiem integrēto koplietošanu.", "Trusted servers" : "Uzticami serveri", - "Add server automatically once a federated share was created successfully" : "Automātiski pievienots serveris federācijas koplietojumam, veiksmīgi", "+ Add trusted server" : "+ pievietot uzticamiem serveriem", "Trusted server" : "Uzticams serveris", - "Add" : "Pievienot" + "Add" : "Pievienot", + "Add server automatically once a federated share was created successfully" : "Automātiski pievienots serveris federācijas koplietojumam, veiksmīgi" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/federation/l10n/mk.js b/apps/federation/l10n/mk.js index 8a3d7b6f62c..e00e979756d 100644 --- a/apps/federation/l10n/mk.js +++ b/apps/federation/l10n/mk.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Федерацијата ви овозможува да се поврзете со други доверливи сервери и размена на корисничките директориуми. Како пример ова ќе биде искористено и како автоматско комплетирање на корисничкото име при споделување во федерацијата.", "Trusted servers" : "Доверливи сервери", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Федерацијата ви овозможува да се поврзете со други доверливи сервери и размена на корисничките директориуми. Како пример ова ќе биде искористено и како автоматско комплетирање на корисничкото име при споделување во федерацијата. Не е потребно да се додаде како веродостоен сервер за да се креира федерално споделување.", - "Add server automatically once a federated share was created successfully" : "Додади го серверот автоматски откога еднаш успешно ќе се споделат податоци со истиот", "+ Add trusted server" : "+ Додади доверлив сервер", "Trusted server" : "Доверлив сервер", - "Add" : "Додади" + "Add" : "Додади", + "Add server automatically once a federated share was created successfully" : "Додади го серверот автоматски откога еднаш успешно ќе се споделат податоци со истиот" }, "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"); diff --git a/apps/federation/l10n/mk.json b/apps/federation/l10n/mk.json index e9b2d489831..26f3dcf7df8 100644 --- a/apps/federation/l10n/mk.json +++ b/apps/federation/l10n/mk.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Федерацијата ви овозможува да се поврзете со други доверливи сервери и размена на корисничките директориуми. Како пример ова ќе биде искористено и како автоматско комплетирање на корисничкото име при споделување во федерацијата.", "Trusted servers" : "Доверливи сервери", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Федерацијата ви овозможува да се поврзете со други доверливи сервери и размена на корисничките директориуми. Како пример ова ќе биде искористено и како автоматско комплетирање на корисничкото име при споделување во федерацијата. Не е потребно да се додаде како веродостоен сервер за да се креира федерално споделување.", - "Add server automatically once a federated share was created successfully" : "Додади го серверот автоматски откога еднаш успешно ќе се споделат податоци со истиот", "+ Add trusted server" : "+ Додади доверлив сервер", "Trusted server" : "Доверлив сервер", - "Add" : "Додади" + "Add" : "Додади", + "Add server automatically once a federated share was created successfully" : "Додади го серверот автоматски откога еднаш успешно ќе се споделат податоци со истиот" },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;" }
\ No newline at end of file diff --git a/apps/federation/l10n/nb.js b/apps/federation/l10n/nb.js index 70790dc0f78..99ec3532dc8 100644 --- a/apps/federation/l10n/nb.js +++ b/apps/federation/l10n/nb.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Sammenknytting tillater deg å koble sammen andre betrodde servere for utveksling av brukermapper. For eksempel vil det bli brukt for autofullføring av eksterne brukere for sammenknyttet deling.", "Trusted servers" : "Klarerte servere", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Sammenknytting tillater deg å koble sammen andre betrodde servere for utveksling av brukermapper. For eksempel vil det bli brukt for autofullføring av eksterne brukere for sammenknyttet deling. Det er ikke nødvendig å legge til en server som pålitelig server for å opprette en forent deling.", - "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling har blitt opprettet", "+ Add trusted server" : "+ Legg til klarert server", "Trusted server" : "Klarert server", - "Add" : "Legg til" + "Add" : "Legg til", + "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling har blitt opprettet" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/nb.json b/apps/federation/l10n/nb.json index be701d26402..563fdcbdee3 100644 --- a/apps/federation/l10n/nb.json +++ b/apps/federation/l10n/nb.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Sammenknytting tillater deg å koble sammen andre betrodde servere for utveksling av brukermapper. For eksempel vil det bli brukt for autofullføring av eksterne brukere for sammenknyttet deling.", "Trusted servers" : "Klarerte servere", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Sammenknytting tillater deg å koble sammen andre betrodde servere for utveksling av brukermapper. For eksempel vil det bli brukt for autofullføring av eksterne brukere for sammenknyttet deling. Det er ikke nødvendig å legge til en server som pålitelig server for å opprette en forent deling.", - "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling har blitt opprettet", "+ Add trusted server" : "+ Legg til klarert server", "Trusted server" : "Klarert server", - "Add" : "Legg til" + "Add" : "Legg til", + "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling har blitt opprettet" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/nl.js b/apps/federation/l10n/nl.js index 4ffcf61c408..94e90ae5c9a 100644 --- a/apps/federation/l10n/nl.js +++ b/apps/federation/l10n/nl.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federatie maakt het mogelijk om te verbinden met vertrouwde servers en de gebuikersadministratie te delen. Zo kun je automatisch externe gebruikers toevoegen voor federatief delen.", "Trusted servers" : "Vertrouwde servers", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Met Federatie kunt u verbinding maken met andere vertrouwde servers om de gebruikersdirectory uit te wisselen. Dit wordt bijvoorbeeld gebruikt om externe gebruikers automatisch aan te vullen voor federatief delen. Het is niet nodig om een server als vertrouwde server toe te voegen om een federatieve share te maken.", - "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is", "+ Add trusted server" : "+ Toevoegen vertrouwde server", "Trusted server" : "Vertrouwde server", - "Add" : "Toevoegen" + "Add" : "Toevoegen", + "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/nl.json b/apps/federation/l10n/nl.json index 39752b09b6c..53d839619fd 100644 --- a/apps/federation/l10n/nl.json +++ b/apps/federation/l10n/nl.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federatie maakt het mogelijk om te verbinden met vertrouwde servers en de gebuikersadministratie te delen. Zo kun je automatisch externe gebruikers toevoegen voor federatief delen.", "Trusted servers" : "Vertrouwde servers", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Met Federatie kunt u verbinding maken met andere vertrouwde servers om de gebruikersdirectory uit te wisselen. Dit wordt bijvoorbeeld gebruikt om externe gebruikers automatisch aan te vullen voor federatief delen. Het is niet nodig om een server als vertrouwde server toe te voegen om een federatieve share te maken.", - "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is", "+ Add trusted server" : "+ Toevoegen vertrouwde server", "Trusted server" : "Vertrouwde server", - "Add" : "Toevoegen" + "Add" : "Toevoegen", + "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/pl.js b/apps/federation/l10n/pl.js index 4c0d156a491..6dd983659a2 100644 --- a/apps/federation/l10n/pl.js +++ b/apps/federation/l10n/pl.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federacja umożliwia łączenie się z innymi zaufanymi serwerami w celu wymiany katalogu użytkownika. Na przykład zostanie to użyte do automatycznego uzupełniania dla zewnętrznych użytkowników przy udostępnianiu federacyjnym.", "Trusted servers" : "Zaufane serwery", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federacja umożliwia łączenie się z innymi zaufanymi serwerami w celu wymiany katalogu użytkownika. Na przykład zostanie to użyte do automatycznego uzupełniania dla zewnętrznych użytkowników przy udostępnianiu federacyjnym. Nie jest konieczne dodawanie serwera jako serwera zaufanego w celu utworzenia udostępnienia federacyjnego.", - "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu udostępnienia federacyjnego", "+ Add trusted server" : "+ Dodaj zaufany serwer", "Trusted server" : "Zaufany serwer", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu udostępnienia federacyjnego" }, "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"); diff --git a/apps/federation/l10n/pl.json b/apps/federation/l10n/pl.json index 2366aa77674..b6a27cab43d 100644 --- a/apps/federation/l10n/pl.json +++ b/apps/federation/l10n/pl.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federacja umożliwia łączenie się z innymi zaufanymi serwerami w celu wymiany katalogu użytkownika. Na przykład zostanie to użyte do automatycznego uzupełniania dla zewnętrznych użytkowników przy udostępnianiu federacyjnym.", "Trusted servers" : "Zaufane serwery", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Federacja umożliwia łączenie się z innymi zaufanymi serwerami w celu wymiany katalogu użytkownika. Na przykład zostanie to użyte do automatycznego uzupełniania dla zewnętrznych użytkowników przy udostępnianiu federacyjnym. Nie jest konieczne dodawanie serwera jako serwera zaufanego w celu utworzenia udostępnienia federacyjnego.", - "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu udostępnienia federacyjnego", "+ Add trusted server" : "+ Dodaj zaufany serwer", "Trusted server" : "Zaufany serwer", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu udostępnienia federacyjnego" },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/federation/l10n/pt_BR.js b/apps/federation/l10n/pt_BR.js index 379d4c611b7..29a694d8c39 100644 --- a/apps/federation/l10n/pt_BR.js +++ b/apps/federation/l10n/pt_BR.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federação permite que você conecte com outros servidores confiáveis para trocar o diretório do usuário. Por exemplo, este atributo será usado para completar automaticamente usuários externos para compartilhamento federado.", "Trusted servers" : "Servidores confiáveis", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "A federação permite que você se conecte com outros servidores confiáveis para trocar o diretório do usuário. Isso é usado, por exemplo, para auto-completar automaticamente usuários externos para compartilhamento federado. Não é necessário adicionar um servidor como servidor confiável para criar um compartilhamento federado.", - "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento federado foi criado com êxito", "+ Add trusted server" : "+Adicionar servidores confiáveis", "Trusted server" : "Servidores confiáveis", - "Add" : "Adicionar" + "Add" : "Adicionar", + "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento federado foi criado com êxito" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/pt_BR.json b/apps/federation/l10n/pt_BR.json index eb4299f2c8b..29d6fd42f97 100644 --- a/apps/federation/l10n/pt_BR.json +++ b/apps/federation/l10n/pt_BR.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federação permite que você conecte com outros servidores confiáveis para trocar o diretório do usuário. Por exemplo, este atributo será usado para completar automaticamente usuários externos para compartilhamento federado.", "Trusted servers" : "Servidores confiáveis", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "A federação permite que você se conecte com outros servidores confiáveis para trocar o diretório do usuário. Isso é usado, por exemplo, para auto-completar automaticamente usuários externos para compartilhamento federado. Não é necessário adicionar um servidor como servidor confiável para criar um compartilhamento federado.", - "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento federado foi criado com êxito", "+ Add trusted server" : "+Adicionar servidores confiáveis", "Trusted server" : "Servidores confiáveis", - "Add" : "Adicionar" + "Add" : "Adicionar", + "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento federado foi criado com êxito" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/pt_PT.js b/apps/federation/l10n/pt_PT.js index da614f528ef..0bb71b28c0d 100644 --- a/apps/federation/l10n/pt_PT.js +++ b/apps/federation/l10n/pt_PT.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federação permite-o conectar-se a outros servidores confiáveis para troca de diretoria de utilizador.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federação permite-o conectar-se a outros servidores confiáveis para trocar a diretoria de utilizador. Por exemplo, isto será usado para completar automaticamente utilizadores externos para partilhada federada.", "Trusted servers" : "Servidores confiáveis", - "Add server automatically once a federated share was created successfully" : "Adicionar o servidor automaticamente assim que uma partilha federada tenha sido criada com sucesso", "+ Add trusted server" : "+ Adicionar servidor confiável", "Trusted server" : "Servidor confiável", - "Add" : "Adicionar" + "Add" : "Adicionar", + "Add server automatically once a federated share was created successfully" : "Adicionar o servidor automaticamente assim que uma partilha federada tenha sido criada com sucesso" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/pt_PT.json b/apps/federation/l10n/pt_PT.json index 919240f0e11..2d387dd210f 100644 --- a/apps/federation/l10n/pt_PT.json +++ b/apps/federation/l10n/pt_PT.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federação permite-o conectar-se a outros servidores confiáveis para troca de diretoria de utilizador.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federação permite-o conectar-se a outros servidores confiáveis para trocar a diretoria de utilizador. Por exemplo, isto será usado para completar automaticamente utilizadores externos para partilhada federada.", "Trusted servers" : "Servidores confiáveis", - "Add server automatically once a federated share was created successfully" : "Adicionar o servidor automaticamente assim que uma partilha federada tenha sido criada com sucesso", "+ Add trusted server" : "+ Adicionar servidor confiável", "Trusted server" : "Servidor confiável", - "Add" : "Adicionar" + "Add" : "Adicionar", + "Add server automatically once a federated share was created successfully" : "Adicionar o servidor automaticamente assim que uma partilha federada tenha sido criada com sucesso" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/ru.js b/apps/federation/l10n/ru.js index 8a0f7edcb85..a85e7d84987 100644 --- a/apps/federation/l10n/ru.js +++ b/apps/federation/l10n/ru.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Федерация серверов позволит Вам подключиться к другим доверенным серверам для обмена каталогами пользователей. Это будет использовано, например, для автодополнения имён пользователей при открытии федеративного общего доступа.", "Trusted servers" : "Доверенные серверы", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Федерация позволяет подключаться к другим доверенным серверам для обмена каталогом пользователей. Например, это будет использоваться для автоматического заполнения внешних пользователей для федеративного общего доступа. Нет необходимости добавлять сервер в качестве доверенного сервера для создания федеративного общего ресурса.", - "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически после успешного создания федеративного ресурса общего доступа", "+ Add trusted server" : "+ Добавить доверенный сервер", "Trusted server" : "Доверенный сервер", - "Add" : "Добавить" + "Add" : "Добавить", + "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически после успешного создания федеративного ресурса общего доступа" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/federation/l10n/ru.json b/apps/federation/l10n/ru.json index db99ad017bf..ab675f0cb55 100644 --- a/apps/federation/l10n/ru.json +++ b/apps/federation/l10n/ru.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Федерация серверов позволит Вам подключиться к другим доверенным серверам для обмена каталогами пользователей. Это будет использовано, например, для автодополнения имён пользователей при открытии федеративного общего доступа.", "Trusted servers" : "Доверенные серверы", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Федерация позволяет подключаться к другим доверенным серверам для обмена каталогом пользователей. Например, это будет использоваться для автоматического заполнения внешних пользователей для федеративного общего доступа. Нет необходимости добавлять сервер в качестве доверенного сервера для создания федеративного общего ресурса.", - "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически после успешного создания федеративного ресурса общего доступа", "+ Add trusted server" : "+ Добавить доверенный сервер", "Trusted server" : "Доверенный сервер", - "Add" : "Добавить" + "Add" : "Добавить", + "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически после успешного создания федеративного ресурса общего доступа" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/federation/l10n/sk.js b/apps/federation/l10n/sk.js index d0365b36949..639074a0b0b 100644 --- a/apps/federation/l10n/sk.js +++ b/apps/federation/l10n/sk.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Združovanie vám umožňuje sa pripojiť k iným dôveryhodným serverom za účelom výmeny adresára používateľov. Používa sa to napr. pre automatické doplňovanie používateľov pri združenom zdieľaní.", "Trusted servers" : "Dôveryhodné servery", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Združovanie vám umožňuje sa pripojiť k iným dôveryhodným serverom za účelom výmeny adresára používateľov. Používa sa to napr. pre automatické doplňovanie používateľov pri združenom zdieľaní. Na vytvorenie zdieľaného adresára nie je potrebné pridať server ako dôveryhodný server.", - "Add server automatically once a federated share was created successfully" : "Pridať server automaticky akonáhle je úspešne vytvorené združené zdieľanie", "+ Add trusted server" : "Pridať dôveryhodný server", "Trusted server" : "Dôveryhodný server", - "Add" : "Pridať" + "Add" : "Pridať", + "Add server automatically once a federated share was created successfully" : "Pridať server automaticky akonáhle je úspešne vytvorené združené zdieľanie" }, "nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"); diff --git a/apps/federation/l10n/sk.json b/apps/federation/l10n/sk.json index b586ec0b510..373e23f6fb4 100644 --- a/apps/federation/l10n/sk.json +++ b/apps/federation/l10n/sk.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Združovanie vám umožňuje sa pripojiť k iným dôveryhodným serverom za účelom výmeny adresára používateľov. Používa sa to napr. pre automatické doplňovanie používateľov pri združenom zdieľaní.", "Trusted servers" : "Dôveryhodné servery", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Združovanie vám umožňuje sa pripojiť k iným dôveryhodným serverom za účelom výmeny adresára používateľov. Používa sa to napr. pre automatické doplňovanie používateľov pri združenom zdieľaní. Na vytvorenie zdieľaného adresára nie je potrebné pridať server ako dôveryhodný server.", - "Add server automatically once a federated share was created successfully" : "Pridať server automaticky akonáhle je úspešne vytvorené združené zdieľanie", "+ Add trusted server" : "Pridať dôveryhodný server", "Trusted server" : "Dôveryhodný server", - "Add" : "Pridať" + "Add" : "Pridať", + "Add server automatically once a federated share was created successfully" : "Pridať server automaticky akonáhle je úspešne vytvorené združené zdieľanie" },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);" }
\ No newline at end of file diff --git a/apps/federation/l10n/sl.js b/apps/federation/l10n/sl.js index 0a8d6c8c43d..88636bec289 100644 --- a/apps/federation/l10n/sl.js +++ b/apps/federation/l10n/sl.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Zvezni oblak omogoča povezovanje z drugimi varnimi strežniki in izmenjavo datotek in map uporabnikov v enotnem oblaku. Možnost omogoča na primer samodejno dopolnjevanje tudi imen uporabnikov na drugih, zunanjih strežnikih.", "Trusted servers" : "Varni strežniki", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Zvezni oblak omogoča povezovanje z drugimi varnimi strežniki in izmenjavo datotek in map uporabnikov v enotnem oblaku. Možnost omogoča na primer samodejno dopolnjevanje tudi imen uporabnikov na drugih, zunanjih strežnikih. Zunanjih strežnikov ni nujno dodati kot zaupanja vredne, da lahko ustvarite povezave.", - "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, če je potrjena kakršnakoli povezava zveznega oblaka.", "+ Add trusted server" : "+ Dodaj varen strežnik", "Trusted server" : "Varen strežnik", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, če je potrjena kakršnakoli povezava zveznega oblaka." }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/federation/l10n/sl.json b/apps/federation/l10n/sl.json index 92263dfbd2c..53c01be9ab5 100644 --- a/apps/federation/l10n/sl.json +++ b/apps/federation/l10n/sl.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Zvezni oblak omogoča povezovanje z drugimi varnimi strežniki in izmenjavo datotek in map uporabnikov v enotnem oblaku. Možnost omogoča na primer samodejno dopolnjevanje tudi imen uporabnikov na drugih, zunanjih strežnikih.", "Trusted servers" : "Varni strežniki", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Zvezni oblak omogoča povezovanje z drugimi varnimi strežniki in izmenjavo datotek in map uporabnikov v enotnem oblaku. Možnost omogoča na primer samodejno dopolnjevanje tudi imen uporabnikov na drugih, zunanjih strežnikih. Zunanjih strežnikov ni nujno dodati kot zaupanja vredne, da lahko ustvarite povezave.", - "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, če je potrjena kakršnakoli povezava zveznega oblaka.", "+ Add trusted server" : "+ Dodaj varen strežnik", "Trusted server" : "Varen strežnik", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, če je potrjena kakršnakoli povezava zveznega oblaka." },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/federation/l10n/sq.js b/apps/federation/l10n/sq.js index 8f53e8c5fbf..87e59872cf9 100644 --- a/apps/federation/l10n/sq.js +++ b/apps/federation/l10n/sq.js @@ -8,9 +8,9 @@ OC.L10N.register( "Federation" : "Federim", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ju lejon të lidheni me server-a të tjerë për të shkëmbyer direktorinë e përdoruesit. Për shembull, kjo mund të përdoret për të parapërgatitur vendet e punës për përdorues të jashtëm në shpërndarjen e federuar.", "Trusted servers" : "Servera të besuar", - "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu server-in pasi të jetë krijuar me sukses një ndarje e federuar", "+ Add trusted server" : "+ Shto server-a të besuar", "Trusted server" : "Server i besuar", - "Add" : "Shto" + "Add" : "Shto", + "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu server-in pasi të jetë krijuar me sukses një ndarje e federuar" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/sq.json b/apps/federation/l10n/sq.json index 33d85f109d2..01a65261259 100644 --- a/apps/federation/l10n/sq.json +++ b/apps/federation/l10n/sq.json @@ -6,9 +6,9 @@ "Federation" : "Federim", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ju lejon të lidheni me server-a të tjerë për të shkëmbyer direktorinë e përdoruesit. Për shembull, kjo mund të përdoret për të parapërgatitur vendet e punës për përdorues të jashtëm në shpërndarjen e federuar.", "Trusted servers" : "Servera të besuar", - "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu server-in pasi të jetë krijuar me sukses një ndarje e federuar", "+ Add trusted server" : "+ Shto server-a të besuar", "Trusted server" : "Server i besuar", - "Add" : "Shto" + "Add" : "Shto", + "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu server-in pasi të jetë krijuar me sukses një ndarje e federuar" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/sr.js b/apps/federation/l10n/sr.js index cc5cc463026..7e571a8acb3 100644 --- a/apps/federation/l10n/sr.js +++ b/apps/federation/l10n/sr.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Здруживање омогућава да се повежете са другим серверима од поверења и да мењате корисничке директоријуме.", "Trusted servers" : "Сервери од поверења", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Здруживање омогућава да се повежете са другим серверима од поверења и да мењате корисничке директоријуме. На пример, федерација ће се користити за налажење спољних корисника код креирања здруженог дељења. Није потребно додати сервер као сервер од поверења да бисте направили здружено дељење.", - "Add server automatically once a federated share was created successfully" : "Додај сервер аутоматски по успешном прављењу здруженог дељења", "+ Add trusted server" : "+ Додај сервер од поверења", "Trusted server" : "Сервер од поверења", - "Add" : "Додај" + "Add" : "Додај", + "Add server automatically once a federated share was created successfully" : "Додај сервер аутоматски по успешном прављењу здруженог дељења" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/federation/l10n/sr.json b/apps/federation/l10n/sr.json index bab149e6e1e..cc0ecae0c14 100644 --- a/apps/federation/l10n/sr.json +++ b/apps/federation/l10n/sr.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Здруживање омогућава да се повежете са другим серверима од поверења и да мењате корисничке директоријуме.", "Trusted servers" : "Сервери од поверења", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Здруживање омогућава да се повежете са другим серверима од поверења и да мењате корисничке директоријуме. На пример, федерација ће се користити за налажење спољних корисника код креирања здруженог дељења. Није потребно додати сервер као сервер од поверења да бисте направили здружено дељење.", - "Add server automatically once a federated share was created successfully" : "Додај сервер аутоматски по успешном прављењу здруженог дељења", "+ Add trusted server" : "+ Додај сервер од поверења", "Trusted server" : "Сервер од поверења", - "Add" : "Додај" + "Add" : "Додај", + "Add server automatically once a federated share was created successfully" : "Додај сервер аутоматски по успешном прављењу здруженог дељења" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/federation/l10n/sv.js b/apps/federation/l10n/sv.js index a2f5208d6d3..4b6b7ee2251 100644 --- a/apps/federation/l10n/sv.js +++ b/apps/federation/l10n/sv.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federation låter dig ansluta med andra betrodda servrar för att utbyta användarkatalogen.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation låter dig ansluta till andra betrodda servrar för att utbyta användarinformation. Till exempel kommer detta användas för att auto-komplettera externa användare för federerad delning.", "Trusted servers" : "Betrodda servrar", - "Add server automatically once a federated share was created successfully" : "Lägg till servern automatiskt så fort en lyckad federerad delning skapats", "+ Add trusted server" : "+ Lägg till betrodd server", "Trusted server" : "Betrodd server", - "Add" : "Lägg till" + "Add" : "Lägg till", + "Add server automatically once a federated share was created successfully" : "Lägg till servern automatiskt så fort en lyckad federerad delning skapats" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/sv.json b/apps/federation/l10n/sv.json index 4eb680f9bad..e7a770bfe90 100644 --- a/apps/federation/l10n/sv.json +++ b/apps/federation/l10n/sv.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federation låter dig ansluta med andra betrodda servrar för att utbyta användarkatalogen.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation låter dig ansluta till andra betrodda servrar för att utbyta användarinformation. Till exempel kommer detta användas för att auto-komplettera externa användare för federerad delning.", "Trusted servers" : "Betrodda servrar", - "Add server automatically once a federated share was created successfully" : "Lägg till servern automatiskt så fort en lyckad federerad delning skapats", "+ Add trusted server" : "+ Lägg till betrodd server", "Trusted server" : "Betrodd server", - "Add" : "Lägg till" + "Add" : "Lägg till", + "Add server automatically once a federated share was created successfully" : "Lägg till servern automatiskt så fort en lyckad federerad delning skapats" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/tr.js b/apps/federation/l10n/tr.js index fb166589034..27cc1ef03a3 100644 --- a/apps/federation/l10n/tr.js +++ b/apps/federation/l10n/tr.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Birleşik çalışma, diğer güvenilir sunucularla dosya/klasör paylaşımı yapılmasını sağlar. Örneğin, bu işlem birleşik paylaşım için dış kullanıcıların otomatik olarak tamamlanmasını sağlar.", "Trusted servers" : "Güvenilen sunucular", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Birleşik çalışma, diğer güvenilir sunucularla dosya/klasör paylaşımı yapılmasını sağlar. Örneğin, bu işlem birleşik paylaşım için dış kullanıcıların otomatik olarak tamamlanmasını sağlar. Bir birleşik çalışma oluşturmak için güvenilir bir sunucu eklenmesi gerekmez.", - "Add server automatically once a federated share was created successfully" : "Bir birleşik paylaşım eklendiğinde sunucu otomatik olarak eklensin", "+ Add trusted server" : "+ Güvenilir sunucu ekle", "Trusted server" : "Güvenilen sunucu", - "Add" : "Ekle" + "Add" : "Ekle", + "Add server automatically once a federated share was created successfully" : "Bir birleşik paylaşım eklendiğinde sunucu otomatik olarak eklensin" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/tr.json b/apps/federation/l10n/tr.json index 30c2bc2341f..7ce0c0ef446 100644 --- a/apps/federation/l10n/tr.json +++ b/apps/federation/l10n/tr.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Birleşik çalışma, diğer güvenilir sunucularla dosya/klasör paylaşımı yapılmasını sağlar. Örneğin, bu işlem birleşik paylaşım için dış kullanıcıların otomatik olarak tamamlanmasını sağlar.", "Trusted servers" : "Güvenilen sunucular", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Birleşik çalışma, diğer güvenilir sunucularla dosya/klasör paylaşımı yapılmasını sağlar. Örneğin, bu işlem birleşik paylaşım için dış kullanıcıların otomatik olarak tamamlanmasını sağlar. Bir birleşik çalışma oluşturmak için güvenilir bir sunucu eklenmesi gerekmez.", - "Add server automatically once a federated share was created successfully" : "Bir birleşik paylaşım eklendiğinde sunucu otomatik olarak eklensin", "+ Add trusted server" : "+ Güvenilir sunucu ekle", "Trusted server" : "Güvenilen sunucu", - "Add" : "Ekle" + "Add" : "Ekle", + "Add server automatically once a federated share was created successfully" : "Bir birleşik paylaşım eklendiğinde sunucu otomatik olarak eklensin" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/uk.js b/apps/federation/l10n/uk.js index a940712c81b..0a9a8df4a7c 100644 --- a/apps/federation/l10n/uk.js +++ b/apps/federation/l10n/uk.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "Об'єднання дає вам можливість встановити зв'язок з іншими довіреними серверами для обміну користувацькими каталогами.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Об'єднання дає вам можливість встановити зв'язок з іншими довіреними серверами для обміну користувацькими каталогами. Наприклад це може бути використане для авто-доповнення зовнішнім користувачам для об'єднаних поширень.", "Trusted servers" : "Довірені сервера", - "Add server automatically once a federated share was created successfully" : "Додати сервер автоматично в разі успішного створення об'єднаного поширення", "+ Add trusted server" : "Додати довірений сервер", "Trusted server" : "Довірений сервер", - "Add" : "Додати" + "Add" : "Додати", + "Add server automatically once a federated share was created successfully" : "Додати сервер автоматично в разі успішного створення об'єднаного поширення" }, "nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"); diff --git a/apps/federation/l10n/uk.json b/apps/federation/l10n/uk.json index 01cdbbfb830..fc5987f3105 100644 --- a/apps/federation/l10n/uk.json +++ b/apps/federation/l10n/uk.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "Об'єднання дає вам можливість встановити зв'язок з іншими довіреними серверами для обміну користувацькими каталогами.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Об'єднання дає вам можливість встановити зв'язок з іншими довіреними серверами для обміну користувацькими каталогами. Наприклад це може бути використане для авто-доповнення зовнішнім користувачам для об'єднаних поширень.", "Trusted servers" : "Довірені сервера", - "Add server automatically once a federated share was created successfully" : "Додати сервер автоматично в разі успішного створення об'єднаного поширення", "+ Add trusted server" : "Додати довірений сервер", "Trusted server" : "Довірений сервер", - "Add" : "Додати" + "Add" : "Додати", + "Add server automatically once a federated share was created successfully" : "Додати сервер автоматично в разі успішного створення об'єднаного поширення" },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);" }
\ No newline at end of file diff --git a/apps/federation/l10n/vi.js b/apps/federation/l10n/vi.js index 2b471acb968..e1eb16f3c0b 100644 --- a/apps/federation/l10n/vi.js +++ b/apps/federation/l10n/vi.js @@ -9,9 +9,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory." : "Kết nối Liên Bang cho phép bạn có thể kết nối với các máy chủ được tin tưởng khác để trao đổi chỉ mục người dùng", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Kết nối Liên Bang cho phép bạn kết nối với các máy chủ tin tưởng khác để trao đổi chỉ mục người dùng. Lấy ví dụ, kết nối này sẽ được dùng để tự-động-điền các người dùng bên ngoài cho các chia sẻ Liên Bang.", "Trusted servers" : "Các máy chủ được tin tưởng", - "Add server automatically once a federated share was created successfully" : "Thêm máy chủ một cách tự động mỗi khi một chia sẻ Liên Bang được tạo thành công", "+ Add trusted server" : "+ Thêm máy chủ được tin cậy", "Trusted server" : "Máy chủ được tin cậy", - "Add" : "Thêm" + "Add" : "Thêm", + "Add server automatically once a federated share was created successfully" : "Thêm máy chủ một cách tự động mỗi khi một chia sẻ Liên Bang được tạo thành công" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/vi.json b/apps/federation/l10n/vi.json index b8a282adc49..064b9949e3b 100644 --- a/apps/federation/l10n/vi.json +++ b/apps/federation/l10n/vi.json @@ -7,9 +7,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory." : "Kết nối Liên Bang cho phép bạn có thể kết nối với các máy chủ được tin tưởng khác để trao đổi chỉ mục người dùng", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Kết nối Liên Bang cho phép bạn kết nối với các máy chủ tin tưởng khác để trao đổi chỉ mục người dùng. Lấy ví dụ, kết nối này sẽ được dùng để tự-động-điền các người dùng bên ngoài cho các chia sẻ Liên Bang.", "Trusted servers" : "Các máy chủ được tin tưởng", - "Add server automatically once a federated share was created successfully" : "Thêm máy chủ một cách tự động mỗi khi một chia sẻ Liên Bang được tạo thành công", "+ Add trusted server" : "+ Thêm máy chủ được tin cậy", "Trusted server" : "Máy chủ được tin cậy", - "Add" : "Thêm" + "Add" : "Thêm", + "Add server automatically once a federated share was created successfully" : "Thêm máy chủ một cách tự động mỗi khi một chia sẻ Liên Bang được tạo thành công" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/l10n/zh_CN.js b/apps/federation/l10n/zh_CN.js index ad64a2c1615..857321a6082 100644 --- a/apps/federation/l10n/zh_CN.js +++ b/apps/federation/l10n/zh_CN.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "联合云功能允许您与其他受信任的服务器连接并交换用户目录。 例如，这将用于自动完成外部用户组成共享联合。", "Trusted servers" : "受信任服务器", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "联合云（Federation）应用允许您连接其他受信任的服务器以交换用户目录。例如，这将用于自动完成外部用户的联合共享。无需将服务器添加为受信任服务器即可创建联合共享。", - "Add server automatically once a federated share was created successfully" : "一旦联合云共享创建成功自动添加服务器", "+ Add trusted server" : "+ 添加受信任服务器", "Trusted server" : "受信任服务器", - "Add" : "添加" + "Add" : "添加", + "Add server automatically once a federated share was created successfully" : "一旦联合云共享创建成功自动添加服务器" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/zh_CN.json b/apps/federation/l10n/zh_CN.json index 1aa63f5cee8..aa54818e3f2 100644 --- a/apps/federation/l10n/zh_CN.json +++ b/apps/federation/l10n/zh_CN.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "联合云功能允许您与其他受信任的服务器连接并交换用户目录。 例如，这将用于自动完成外部用户组成共享联合。", "Trusted servers" : "受信任服务器", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "联合云（Federation）应用允许您连接其他受信任的服务器以交换用户目录。例如，这将用于自动完成外部用户的联合共享。无需将服务器添加为受信任服务器即可创建联合共享。", - "Add server automatically once a federated share was created successfully" : "一旦联合云共享创建成功自动添加服务器", "+ Add trusted server" : "+ 添加受信任服务器", "Trusted server" : "受信任服务器", - "Add" : "添加" + "Add" : "添加", + "Add server automatically once a federated share was created successfully" : "一旦联合云共享创建成功自动添加服务器" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/l10n/zh_HK.js b/apps/federation/l10n/zh_HK.js index df9183f61ae..c28d9099399 100644 --- a/apps/federation/l10n/zh_HK.js +++ b/apps/federation/l10n/zh_HK.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "聯盟功能允許您與信任的伺服器連結，交換用戶列表。舉例來說，與其他雲端聯盟的用戶分享檔案時，有了這一份列表，就可以在輸入框搜尋他們的用戶名稱。", "Trusted servers" : "信任的伺服器", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "聯盟功能允許您與信任的伺服器連結，交換用戶列表。舉例來說，與其他雲端聯盟的用戶分享檔案時，有了這一份列表，就可以在輸入框搜尋他們的用戶名稱。不必將伺服器新增為受信任的伺服器就可以建立聯盟分享。", - "Add server automatically once a federated share was created successfully" : "當聯盟分享成功建立的時候自動將伺服器加入信任清單", "+ Add trusted server" : "+ 加入信任的伺服器", "Trusted server" : "信任的伺服器", - "Add" : "新增" + "Add" : "新增", + "Add server automatically once a federated share was created successfully" : "當聯盟分享成功建立的時候自動將伺服器加入信任清單" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/zh_HK.json b/apps/federation/l10n/zh_HK.json index 2651021c8fe..fe64bc9b605 100644 --- a/apps/federation/l10n/zh_HK.json +++ b/apps/federation/l10n/zh_HK.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "聯盟功能允許您與信任的伺服器連結，交換用戶列表。舉例來說，與其他雲端聯盟的用戶分享檔案時，有了這一份列表，就可以在輸入框搜尋他們的用戶名稱。", "Trusted servers" : "信任的伺服器", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "聯盟功能允許您與信任的伺服器連結，交換用戶列表。舉例來說，與其他雲端聯盟的用戶分享檔案時，有了這一份列表，就可以在輸入框搜尋他們的用戶名稱。不必將伺服器新增為受信任的伺服器就可以建立聯盟分享。", - "Add server automatically once a federated share was created successfully" : "當聯盟分享成功建立的時候自動將伺服器加入信任清單", "+ Add trusted server" : "+ 加入信任的伺服器", "Trusted server" : "信任的伺服器", - "Add" : "新增" + "Add" : "新增", + "Add server automatically once a federated share was created successfully" : "當聯盟分享成功建立的時候自動將伺服器加入信任清單" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/l10n/zh_TW.js b/apps/federation/l10n/zh_TW.js index cc35cc9dcd7..af720e64383 100644 --- a/apps/federation/l10n/zh_TW.js +++ b/apps/federation/l10n/zh_TW.js @@ -10,9 +10,9 @@ OC.L10N.register( "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "聯盟功能允許您與信任的伺服器連結，交換使用者列表。舉例來說，與其他雲端聯盟的使用者分享檔案時，有了這一份列表，就可以在輸入框搜尋他們的使用者名稱。", "Trusted servers" : "信任的伺服器", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "聯盟功能允許您與信任的伺服器連結，交換使用者列表。舉例來說，與其他雲端聯盟的使用者分享檔案時，有了這一份列表，就可以在輸入框搜尋他們的使用者名稱。不必將伺服器新增為受信任的伺服器就可以建立聯盟分享。", - "Add server automatically once a federated share was created successfully" : "當聯盟分享成功建立的時候自動將伺服器加入信任清單", "+ Add trusted server" : "+ 新增信任的伺服器", "Trusted server" : "信任的伺服器", - "Add" : "新增" + "Add" : "新增", + "Add server automatically once a federated share was created successfully" : "當聯盟分享成功建立的時候自動將伺服器加入信任清單" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/zh_TW.json b/apps/federation/l10n/zh_TW.json index 81f63f5a656..16ba274c660 100644 --- a/apps/federation/l10n/zh_TW.json +++ b/apps/federation/l10n/zh_TW.json @@ -8,9 +8,9 @@ "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "聯盟功能允許您與信任的伺服器連結，交換使用者列表。舉例來說，與其他雲端聯盟的使用者分享檔案時，有了這一份列表，就可以在輸入框搜尋他們的使用者名稱。", "Trusted servers" : "信任的伺服器", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "聯盟功能允許您與信任的伺服器連結，交換使用者列表。舉例來說，與其他雲端聯盟的使用者分享檔案時，有了這一份列表，就可以在輸入框搜尋他們的使用者名稱。不必將伺服器新增為受信任的伺服器就可以建立聯盟分享。", - "Add server automatically once a federated share was created successfully" : "當聯盟分享成功建立的時候自動將伺服器加入信任清單", "+ Add trusted server" : "+ 新增信任的伺服器", "Trusted server" : "信任的伺服器", - "Add" : "新增" + "Add" : "新增", + "Add server automatically once a federated share was created successfully" : "當聯盟分享成功建立的時候自動將伺服器加入信任清單" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/lib/AppInfo/Application.php b/apps/federation/lib/AppInfo/Application.php index bab9565eba8..72e96d85292 100644 --- a/apps/federation/lib/AppInfo/Application.php +++ b/apps/federation/lib/AppInfo/Application.php @@ -26,8 +26,6 @@ namespace OCA\Federation\AppInfo; use OCA\DAV\Events\SabrePluginAuthInitEvent; -use OCA\FederatedFileSharing\Events\FederatedShareAddedEvent; -use OCA\Federation\Listener\FederatedShareAddedListener; use OCA\Federation\Listener\SabrePluginAuthInitListener; use OCA\Federation\Middleware\AddServerMiddleware; use OCP\AppFramework\App; @@ -47,7 +45,6 @@ class Application extends App implements IBootstrap { public function register(IRegistrationContext $context): void { $context->registerMiddleware(AddServerMiddleware::class); - $context->registerEventListener(FederatedShareAddedEvent::class, FederatedShareAddedListener::class); $context->registerEventListener(SabrePluginAuthInitEvent::class, SabrePluginAuthInitListener::class); } diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php index 466f1c008a7..dedfd70731f 100644 --- a/apps/federation/lib/Controller/SettingsController.php +++ b/apps/federation/lib/Controller/SettingsController.php @@ -88,16 +88,6 @@ class SettingsController extends Controller { } /** - * enable/disable to automatically add servers to the list of trusted servers - * once a federated share was created and accepted successfully - * - * @param bool $autoAddServers - */ - public function autoAddServers($autoAddServers) { - $this->trustedServers->setAutoAddServers($autoAddServers); - } - - /** * check if the server should be added to the list of trusted servers or not * * @param string $url diff --git a/apps/federation/lib/Hooks.php b/apps/federation/lib/Hooks.php deleted file mode 100644 index f02409ef242..00000000000 --- a/apps/federation/lib/Hooks.php +++ /dev/null @@ -1,47 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Björn Schießle <bjoern@schiessle.org> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -namespace OCA\Federation; - -class Hooks { - - /** @var TrustedServers */ - private $trustedServers; - - public function __construct(TrustedServers $trustedServers) { - $this->trustedServers = $trustedServers; - } - - /** - * add servers to the list of trusted servers once a federated share was established - * - * @param array $params - */ - public function addServerHook($params) { - if ( - $this->trustedServers->getAutoAddServers() === true && - $this->trustedServers->isTrustedServer($params['server']) === false - ) { - $this->trustedServers->addServer($params['server']); - } - } -} diff --git a/apps/federation/lib/Listener/FederatedShareAddedListener.php b/apps/federation/lib/Listener/FederatedShareAddedListener.php deleted file mode 100644 index 21eb9450772..00000000000 --- a/apps/federation/lib/Listener/FederatedShareAddedListener.php +++ /dev/null @@ -1,60 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * @copyright Copyright (c) 2020, Morris Jobke <hey@morrisjobke.de> - * - * @author Morris Jobke <hey@morrisjobke.de> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\Federation\Listener; - -use OCA\FederatedFileSharing\Events\FederatedShareAddedEvent; -use OCA\Federation\TrustedServers; -use OCP\EventDispatcher\Event; -use OCP\EventDispatcher\IEventListener; - -/** - * Automatically add new servers to the list of trusted servers. - * - * @since 20.0.0 - */ -class FederatedShareAddedListener implements IEventListener { - /** @var TrustedServers */ - private $trustedServers; - - public function __construct(TrustedServers $trustedServers) { - $this->trustedServers = $trustedServers; - } - - public function handle(Event $event): void { - if (!($event instanceof FederatedShareAddedEvent)) { - return; - } - - $server = $event->getRemote(); - if ( - $this->trustedServers->getAutoAddServers() === true && - $this->trustedServers->isTrustedServer($server) === false - ) { - $this->trustedServers->addServer($server); - } - } -} diff --git a/apps/federation/lib/Settings/Admin.php b/apps/federation/lib/Settings/Admin.php index 9dd06dc8f53..af4addecc41 100644 --- a/apps/federation/lib/Settings/Admin.php +++ b/apps/federation/lib/Settings/Admin.php @@ -42,7 +42,6 @@ class Admin implements ISettings { public function getForm() { $parameters = [ 'trustedServers' => $this->trustedServers->getServers(), - 'autoAddServers' => $this->trustedServers->getAutoAddServers(), ]; return new TemplateResponse('federation', 'settings-admin', $parameters, ''); diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php index 92454e03a55..29b58555238 100644 --- a/apps/federation/lib/TrustedServers.php +++ b/apps/federation/lib/TrustedServers.php @@ -131,28 +131,6 @@ class TrustedServers { } /** - * enable/disable to automatically add servers to the list of trusted servers - * once a federated share was created and accepted successfully - * - * @param bool $status - */ - public function setAutoAddServers($status) { - $value = $status ? '1' : '0'; - $this->config->setAppValue('federation', 'autoAddServers', $value); - } - - /** - * return if we automatically add servers to the list of trusted servers - * once a federated share was created and accepted successfully - * - * @return bool - */ - public function getAutoAddServers() { - $value = $this->config->getAppValue('federation', 'autoAddServers', '0'); - return $value === '1'; - } - - /** * get shared secret for the given server * * @param string $url diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php index 407a1fa9442..3fa7a02a02e 100644 --- a/apps/federation/templates/settings-admin.php +++ b/apps/federation/templates/settings-admin.php @@ -10,13 +10,6 @@ style('federation', 'settings-admin') <h2><?php p($l->t('Trusted servers')); ?></h2> <p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share.')); ?></p> - <p> - <input id="autoAddServers" type="checkbox" class="checkbox" <?php if ($_['autoAddServers']) { - p('checked'); -} ?> /> - <label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label> - </p> - <ul id="listOfTrustedServers"> <?php foreach ($_['trustedServers'] as $trustedServer) { ?> <li id="<?php p($trustedServer['id']); ?>"> diff --git a/apps/federation/tests/HooksTest.php b/apps/federation/tests/HooksTest.php deleted file mode 100644 index 8741ddb9fd6..00000000000 --- a/apps/federation/tests/HooksTest.php +++ /dev/null @@ -1,80 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Björn Schießle <bjoern@schiessle.org> - * @author Joas Schilling <coding@schilljs.com> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -namespace OCA\Federation\Tests; - -use OCA\Federation\Hooks; -use OCA\Federation\TrustedServers; -use Test\TestCase; - -class HooksTest extends TestCase { - - /** @var \PHPUnit\Framework\MockObject\MockObject | TrustedServers */ - private $trustedServers; - - /** @var Hooks */ - private $hooks; - - protected function setUp(): void { - parent::setUp(); - - $this->trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers') - ->disableOriginalConstructor()->getMock(); - - $this->hooks = new Hooks($this->trustedServers); - } - - /** - * @dataProvider dataTestAddServerHook - * - * @param bool $autoAddEnabled is auto-add enabled - * @param bool $isTrustedServer is the server already in the list of trusted servers - * @param bool $addServer should the server be added - */ - public function testAddServerHook($autoAddEnabled, $isTrustedServer, $addServer) { - $this->trustedServers->expects($this->any())->method('getAutoAddServers') - ->willReturn($autoAddEnabled); - $this->trustedServers->expects($this->any())->method('isTrustedServer') - ->with('url')->willReturn($isTrustedServer); - - if ($addServer) { - $this->trustedServers->expects($this->once())->method('addServer') - ->with('url'); - } else { - $this->trustedServers->expects($this->never())->method('addServer'); - } - - $this->hooks->addServerHook(['server' => 'url']); - } - - public function dataTestAddServerHook() { - return [ - [true, true, false], - [false, true, false], - [true, false, true], - [false, false, false], - ]; - } -} diff --git a/apps/federation/tests/Settings/AdminTest.php b/apps/federation/tests/Settings/AdminTest.php index 75ccabb968f..9c60f732f96 100644 --- a/apps/federation/tests/Settings/AdminTest.php +++ b/apps/federation/tests/Settings/AdminTest.php @@ -48,14 +48,9 @@ class AdminTest extends TestCase { ->expects($this->once()) ->method('getServers') ->willReturn(['myserver', 'secondserver']); - $this->trustedServers - ->expects($this->once()) - ->method('getAutoAddServers') - ->willReturn(['autoserver1', 'autoserver2']); $params = [ 'trustedServers' => ['myserver', 'secondserver'], - 'autoAddServers' => ['autoserver1', 'autoserver2'], ]; $expected = new TemplateResponse('federation', 'settings-admin', $params, ''); $this->assertEquals($expected, $this->admin->getForm()); diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php index 5cb494643b8..bc16f14eedd 100644 --- a/apps/federation/tests/TrustedServersTest.php +++ b/apps/federation/tests/TrustedServersTest.php @@ -156,45 +156,6 @@ class TrustedServersTest extends TestCase { ]; } - /** - * @dataProvider dataTrueFalse - * - * @param bool $status - */ - public function testSetAutoAddServers($status) { - if ($status) { - $this->config->expects($this->once())->method('setAppValue') - ->with('federation', 'autoAddServers', '1'); - } else { - $this->config->expects($this->once())->method('setAppValue') - ->with('federation', 'autoAddServers', '0'); - } - - $this->trustedServers->setAutoAddServers($status); - } - - /** - * @dataProvider dataTestGetAutoAddServers - * - * @param string $status - * @param bool $expected - */ - public function testGetAutoAddServers($status, $expected) { - $this->config->expects($this->once())->method('getAppValue') - ->with('federation', 'autoAddServers', '0')->willReturn($status); - - $this->assertSame($expected, - $this->trustedServers->getAutoAddServers() - ); - } - - public function dataTestGetAutoAddServers() { - return [ - ['1', true], - ['0', false] - ]; - } - public function testAddSharedSecret() { $this->dbHandler->expects($this->once())->method('addSharedSecret') ->with('url', 'secret'); diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js index 95f52019808..89f480ae846 100644 --- a/apps/files/l10n/eu.js +++ b/apps/files/l10n/eu.js @@ -190,6 +190,7 @@ OC.L10N.register( "Crop image previews" : "Moztu irudien aurrebistak", "WebDAV" : "WebDAV", "Use this address to access your Files via WebDAV" : "Erabili helbide hau WebDAV bidez zure fitxategietara sartzeko", + "Toggle %1$s sublist" : "Txandakatu %1$sazpizerrenda", "Toggle grid view" : "Txandakatu sareta ikuspegia", "No files in here" : "Ez dago fitxategirik hemen", "Upload some content or sync with your devices!" : "Kargatu edukiren bat edo sinkronizatu zure gailuekin!", diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json index 0f71d4720c2..d97dffa0421 100644 --- a/apps/files/l10n/eu.json +++ b/apps/files/l10n/eu.json @@ -188,6 +188,7 @@ "Crop image previews" : "Moztu irudien aurrebistak", "WebDAV" : "WebDAV", "Use this address to access your Files via WebDAV" : "Erabili helbide hau WebDAV bidez zure fitxategietara sartzeko", + "Toggle %1$s sublist" : "Txandakatu %1$sazpizerrenda", "Toggle grid view" : "Txandakatu sareta ikuspegia", "No files in here" : "Ez dago fitxategirik hemen", "Upload some content or sync with your devices!" : "Kargatu edukiren bat edo sinkronizatu zure gailuekin!", diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index bb04d7ea5d3..c0d9a99aa07 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -190,6 +190,7 @@ OC.L10N.register( "Crop image previews" : "Cortar visualizações de imagem", "WebDAV" : "WebDAV", "Use this address to access your Files via WebDAV" : "Use este endereço para acessar seus Arquivos via WebDAV", + "Toggle %1$s sublist" : "Alternar a sublista %1$s", "Toggle grid view" : "Alternar vista de grade", "No files in here" : "Nenhum arquivo aqui", "Upload some content or sync with your devices!" : "Envie um arquivo ou sincronize com seus dispositivos!", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index 1a5210b1118..22eed85ce4a 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -188,6 +188,7 @@ "Crop image previews" : "Cortar visualizações de imagem", "WebDAV" : "WebDAV", "Use this address to access your Files via WebDAV" : "Use este endereço para acessar seus Arquivos via WebDAV", + "Toggle %1$s sublist" : "Alternar a sublista %1$s", "Toggle grid view" : "Alternar vista de grade", "No files in here" : "Nenhum arquivo aqui", "Upload some content or sync with your devices!" : "Envie um arquivo ou sincronize com seus dispositivos!", diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js index da29e66f875..66b0b3e352d 100644 --- a/apps/files_external/l10n/pl.js +++ b/apps/files_external/l10n/pl.js @@ -11,7 +11,7 @@ OC.L10N.register( "Generate keys" : "Wygeneruj klucze", "Error generating key pair" : "Błąd podczas generowania pary kluczy", "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", - "(Group)" : "(grupa)", + "(Group)" : "(Grupa)", "Compatibility with Mac NFD encoding (slow)" : "Zgodność z kodowaniem Mac NFD (powolny)", "Enable encryption" : "Włącz szyfrowanie", "Enable previews" : "Włącz podgląd", diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json index dc28a2d46f5..b3af135cd33 100644 --- a/apps/files_external/l10n/pl.json +++ b/apps/files_external/l10n/pl.json @@ -9,7 +9,7 @@ "Generate keys" : "Wygeneruj klucze", "Error generating key pair" : "Błąd podczas generowania pary kluczy", "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.", - "(Group)" : "(grupa)", + "(Group)" : "(Grupa)", "Compatibility with Mac NFD encoding (slow)" : "Zgodność z kodowaniem Mac NFD (powolny)", "Enable encryption" : "Włącz szyfrowanie", "Enable previews" : "Włącz podgląd", diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js index e87ae708c9f..2ce5b5860d6 100644 --- a/apps/files_external/l10n/pt_BR.js +++ b/apps/files_external/l10n/pt_BR.js @@ -11,6 +11,7 @@ OC.L10N.register( "Generate keys" : "Gerar chaves", "Error generating key pair" : "Erro ao gerar o par de chaves", "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.", + "(Group)" : "(Grupo)", "Compatibility with Mac NFD encoding (slow)" : "Compatibilidade com a codificação Mac NFD (lento)", "Enable encryption" : "Ativar criptografia", "Enable previews" : "Ativar visualizações prévias", diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json index ed69447f527..439aea555a0 100644 --- a/apps/files_external/l10n/pt_BR.json +++ b/apps/files_external/l10n/pt_BR.json @@ -9,6 +9,7 @@ "Generate keys" : "Gerar chaves", "Error generating key pair" : "Erro ao gerar o par de chaves", "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.", + "(Group)" : "(Grupo)", "Compatibility with Mac NFD encoding (slow)" : "Compatibilidade com a codificação Mac NFD (lento)", "Enable encryption" : "Ativar criptografia", "Enable previews" : "Ativar visualizações prévias", diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js index 496d81696ad..edb3a69f720 100644 --- a/apps/files_sharing/l10n/eu.js +++ b/apps/files_sharing/l10n/eu.js @@ -113,6 +113,8 @@ OC.L10N.register( "Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : " %s Nextcloud Talk-etik pasahitza bidaliz partekatzeak huts egin du, Nextcloud Talk ez dagoelako gaituta", "Invalid date, date format must be YYYY-MM-DD" : "Data baliogabea, dataren formatuak UUUU-HH-EE izan behar du", "Sharing %1$s failed because the back end does not allow shares from type %2$s" : " %1$s partekatzeak huts egin du, atzealdeak %2$s motako partekatzeak ez dituelako onartzen", + "Please specify a valid federated user id" : "Mesedez, zehaztu baliozko erabiltzaile federatuaren IDa", + "Please specify a valid federated group id" : "Mesedez, zehaztu baliozko talde federatuaren IDa", "You cannot share to a Circle if the app is not enabled" : "Ezin duzu zirkulu batekin partekatu aplikazioa gaituta ez badago", "Please specify a valid circle" : "Zehaztu baliozko zirkulu bat", "Sharing %s failed because the back end does not support room shares" : "%s partekatzeak huts egin du, atzealdeak ez duelako gelak partekatzea onartzen", @@ -183,6 +185,7 @@ OC.L10N.register( "Create a new share link" : "Sortu partekatze esteka berri bat", "{shareWith} by {initiator}" : "{initiator} erabiltzaileak {shareWith} ", "Shared via link by {initiator}" : "{initiator} erabiltzaileak esteka bidez partekatua", + "Mail share ({label})" : "Posta partekatzea ({label})", "Share link ({label})" : "Partekatu ({label}) eskeka", "Share link" : "Partekatu esteka", "Error, please enter proper password and/or expiration date" : "Errorea, sartu dagokion pasahitza edo/eta iraungitze-data", diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json index 9c44d899c5b..e841f04a8b0 100644 --- a/apps/files_sharing/l10n/eu.json +++ b/apps/files_sharing/l10n/eu.json @@ -111,6 +111,8 @@ "Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : " %s Nextcloud Talk-etik pasahitza bidaliz partekatzeak huts egin du, Nextcloud Talk ez dagoelako gaituta", "Invalid date, date format must be YYYY-MM-DD" : "Data baliogabea, dataren formatuak UUUU-HH-EE izan behar du", "Sharing %1$s failed because the back end does not allow shares from type %2$s" : " %1$s partekatzeak huts egin du, atzealdeak %2$s motako partekatzeak ez dituelako onartzen", + "Please specify a valid federated user id" : "Mesedez, zehaztu baliozko erabiltzaile federatuaren IDa", + "Please specify a valid federated group id" : "Mesedez, zehaztu baliozko talde federatuaren IDa", "You cannot share to a Circle if the app is not enabled" : "Ezin duzu zirkulu batekin partekatu aplikazioa gaituta ez badago", "Please specify a valid circle" : "Zehaztu baliozko zirkulu bat", "Sharing %s failed because the back end does not support room shares" : "%s partekatzeak huts egin du, atzealdeak ez duelako gelak partekatzea onartzen", @@ -181,6 +183,7 @@ "Create a new share link" : "Sortu partekatze esteka berri bat", "{shareWith} by {initiator}" : "{initiator} erabiltzaileak {shareWith} ", "Shared via link by {initiator}" : "{initiator} erabiltzaileak esteka bidez partekatua", + "Mail share ({label})" : "Posta partekatzea ({label})", "Share link ({label})" : "Partekatu ({label}) eskeka", "Share link" : "Partekatu esteka", "Error, please enter proper password and/or expiration date" : "Errorea, sartu dagokion pasahitza edo/eta iraungitze-data", diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index d1a82cae9d0..bf7e7a18a54 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -209,7 +209,7 @@ OC.L10N.register( "Error updating the share: {errorMessage}" : "Fout bij aanpassen van de share: {errorMessage}", "Error updating the share" : "Fout tijdens bijwerken share", "Shared" : "Gedeeld", - "Share" : "Deel", + "Share" : "Delen", "Shared with" : "Gedeeld met", "Shared with you and the group {group} by {owner}" : "Met jou en de groep {group} gedeeld door {owner}", "Shared with you and {circle} by {owner}" : "Gedeeld met jou en {circle} door {owner}", diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index a468e704962..2077f053e91 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -207,7 +207,7 @@ "Error updating the share: {errorMessage}" : "Fout bij aanpassen van de share: {errorMessage}", "Error updating the share" : "Fout tijdens bijwerken share", "Shared" : "Gedeeld", - "Share" : "Deel", + "Share" : "Delen", "Shared with" : "Gedeeld met", "Shared with you and the group {group} by {owner}" : "Met jou en de groep {group} gedeeld door {owner}", "Shared with you and {circle} by {owner}" : "Gedeeld met jou en {circle} door {owner}", diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js index 0baa4847366..487f4ad5789 100644 --- a/apps/files_sharing/l10n/pl.js +++ b/apps/files_sharing/l10n/pl.js @@ -36,7 +36,7 @@ OC.L10N.register( "You can upload into this folder" : "Możesz wysłać do tego katalogu", "Terms of service" : "Warunki usługi", "No compatible server found at {remote}" : "Nie znaleziono kompatybilnego serwera na {remote}", - "Invalid server URL" : "Błędny adres serwera", + "Invalid server URL" : "Nieprawidłowy adres URL serwera", "Failed to add the public link to your Nextcloud" : "Nie udało się dodać linku publicznego do Nextcloud", "No expiration date set" : "Nie ustawiono daty wygaśnięcia", "Shared by" : "Udostępnione przez", @@ -106,7 +106,7 @@ OC.L10N.register( "invalid permissions" : "nieprawidłowe uprawnienia", "Please specify a valid user" : "Podaj prawidłowego użytkownika", "Group sharing is disabled by the administrator" : "Udostępnianie grupowe jest wyłączone przez administratora", - "Please specify a valid group" : "Podaj poprawną grupę", + "Please specify a valid group" : "Podaj prawidłową grupę", "Public link sharing is disabled by the administrator" : "Udostępnianie linków publicznych zostało wyłączone przez administratora", "Public upload disabled by the administrator" : "Przesyłanie publiczne zostało wyłączone przez administratora", "Public upload is only possible for publicly shared folders" : "Przesyłanie publiczne jest możliwe tylko w przypadku katalogów udostępnianych publicznie", @@ -146,7 +146,7 @@ OC.L10N.register( "Allow deleting" : "Zezwalaj na usuwanie", "Allow resharing" : "Zezwalaj na udostępnianie dalej", "Expiration date enforced" : "Wymuszona data wygaśnięcia", - "Set expiration date" : "Ustaw datę ważności", + "Set expiration date" : "Ustaw datę wygaśnięcia", "Enter a date" : "Podaj datę", "Note to recipient" : "Informacja dla odbiorcy", "Unshare" : "Zatrzymaj udostępnianie", diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json index 55dd21f3676..63969f483ac 100644 --- a/apps/files_sharing/l10n/pl.json +++ b/apps/files_sharing/l10n/pl.json @@ -34,7 +34,7 @@ "You can upload into this folder" : "Możesz wysłać do tego katalogu", "Terms of service" : "Warunki usługi", "No compatible server found at {remote}" : "Nie znaleziono kompatybilnego serwera na {remote}", - "Invalid server URL" : "Błędny adres serwera", + "Invalid server URL" : "Nieprawidłowy adres URL serwera", "Failed to add the public link to your Nextcloud" : "Nie udało się dodać linku publicznego do Nextcloud", "No expiration date set" : "Nie ustawiono daty wygaśnięcia", "Shared by" : "Udostępnione przez", @@ -104,7 +104,7 @@ "invalid permissions" : "nieprawidłowe uprawnienia", "Please specify a valid user" : "Podaj prawidłowego użytkownika", "Group sharing is disabled by the administrator" : "Udostępnianie grupowe jest wyłączone przez administratora", - "Please specify a valid group" : "Podaj poprawną grupę", + "Please specify a valid group" : "Podaj prawidłową grupę", "Public link sharing is disabled by the administrator" : "Udostępnianie linków publicznych zostało wyłączone przez administratora", "Public upload disabled by the administrator" : "Przesyłanie publiczne zostało wyłączone przez administratora", "Public upload is only possible for publicly shared folders" : "Przesyłanie publiczne jest możliwe tylko w przypadku katalogów udostępnianych publicznie", @@ -144,7 +144,7 @@ "Allow deleting" : "Zezwalaj na usuwanie", "Allow resharing" : "Zezwalaj na udostępnianie dalej", "Expiration date enforced" : "Wymuszona data wygaśnięcia", - "Set expiration date" : "Ustaw datę ważności", + "Set expiration date" : "Ustaw datę wygaśnięcia", "Enter a date" : "Podaj datę", "Note to recipient" : "Informacja dla odbiorcy", "Unshare" : "Zatrzymaj udostępnianie", diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php index f8966e3a83f..d772e6359ec 100644 --- a/apps/files_sharing/tests/TestCase.php +++ b/apps/files_sharing/tests/TestCase.php @@ -187,7 +187,7 @@ abstract class TestCase extends \Test\TestCase { $userObject = $userManager->createUser($user, $password); $group = $groupManager->createGroup('group'); - if ($group and $userObject) { + if ($group && $userObject) { $group->addUser($userObject); } } diff --git a/apps/settings/l10n/de_DE.js b/apps/settings/l10n/de_DE.js index c74ea04ff6b..e2654c2d850 100644 --- a/apps/settings/l10n/de_DE.js +++ b/apps/settings/l10n/de_DE.js @@ -84,6 +84,7 @@ OC.L10N.register( "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden", "Unable to change email address" : "E-Mail-Adresse konnte nicht geändert werden", "Unable to set invalid phone number" : "Ungültige Rufnummer kann nicht eingestellt werden", + "Unable to set invalid website" : "Ungültige Webseite kann nicht eingestellt werden", "Some account data was invalid" : "Einige Kontodaten waren ungültig", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "Um Ihr Twitter-Konto zu überprüfen, veröffentlichen Sie bitte den folgenden Tweet auf Twitter (Bitte stellen Sie sicher, dass der Tweet keinen Zeilenumbruch enthält):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "Um Ihre Webseite zu überprüfen, speichern Sie bitte den folgenden Inhalt im Web-Wurzelverzeichnist in der Datei '.well-known/CloudIdVerificationCode.txt' (bitte stellen Sie sicher, das sich der gesamte Text in einer Zeile befindet):", diff --git a/apps/settings/l10n/de_DE.json b/apps/settings/l10n/de_DE.json index 8fcbed84fdf..543acc85dd9 100644 --- a/apps/settings/l10n/de_DE.json +++ b/apps/settings/l10n/de_DE.json @@ -82,6 +82,7 @@ "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden", "Unable to change email address" : "E-Mail-Adresse konnte nicht geändert werden", "Unable to set invalid phone number" : "Ungültige Rufnummer kann nicht eingestellt werden", + "Unable to set invalid website" : "Ungültige Webseite kann nicht eingestellt werden", "Some account data was invalid" : "Einige Kontodaten waren ungültig", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "Um Ihr Twitter-Konto zu überprüfen, veröffentlichen Sie bitte den folgenden Tweet auf Twitter (Bitte stellen Sie sicher, dass der Tweet keinen Zeilenumbruch enthält):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "Um Ihre Webseite zu überprüfen, speichern Sie bitte den folgenden Inhalt im Web-Wurzelverzeichnist in der Datei '.well-known/CloudIdVerificationCode.txt' (bitte stellen Sie sicher, das sich der gesamte Text in einer Zeile befindet):", diff --git a/apps/settings/l10n/es.js b/apps/settings/l10n/es.js index 90bc88a71b3..cbb1d59fa3b 100644 --- a/apps/settings/l10n/es.js +++ b/apps/settings/l10n/es.js @@ -84,6 +84,7 @@ OC.L10N.register( "Unable to change full name" : "No se puede cambiar el nombre completo", "Unable to change email address" : "No se pudo cambiar la dirección de correo", "Unable to set invalid phone number" : "No se pudo establecer un número de teléfono incorrecto", + "Unable to set invalid website" : "No se pudo establecer una página web incorrecta", "Some account data was invalid" : "Algunos datos de la cuenta no son correctos", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "Para verificar tu cuenta de Twitter, escribe el siguiente tuit en Twitter (por favor, asegúrate de escribirlo sin saltos de línea):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "Para verificar tu sitio web, guarda el siguiente contenido en la raíz de la web en '.well-known/CloudIdVerificationCode.txt' (por favor, asegúrate de que el texto completo está en una línea):", diff --git a/apps/settings/l10n/es.json b/apps/settings/l10n/es.json index ad18cd12426..0d444292074 100644 --- a/apps/settings/l10n/es.json +++ b/apps/settings/l10n/es.json @@ -82,6 +82,7 @@ "Unable to change full name" : "No se puede cambiar el nombre completo", "Unable to change email address" : "No se pudo cambiar la dirección de correo", "Unable to set invalid phone number" : "No se pudo establecer un número de teléfono incorrecto", + "Unable to set invalid website" : "No se pudo establecer una página web incorrecta", "Some account data was invalid" : "Algunos datos de la cuenta no son correctos", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "Para verificar tu cuenta de Twitter, escribe el siguiente tuit en Twitter (por favor, asegúrate de escribirlo sin saltos de línea):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "Para verificar tu sitio web, guarda el siguiente contenido en la raíz de la web en '.well-known/CloudIdVerificationCode.txt' (por favor, asegúrate de que el texto completo está en una línea):", diff --git a/apps/settings/l10n/pl.js b/apps/settings/l10n/pl.js index bd57fce772c..96bfe054ee3 100644 --- a/apps/settings/l10n/pl.js +++ b/apps/settings/l10n/pl.js @@ -84,6 +84,7 @@ OC.L10N.register( "Unable to change full name" : "Nie można zmienić pełnej nazwy", "Unable to change email address" : "Nie można zmienić adresu e-mail", "Unable to set invalid phone number" : "Nie można ustawić nieprawidłowego numeru telefonu", + "Unable to set invalid website" : "Nie można ustawić nieprawidłowej strony internetowej", "Some account data was invalid" : "Niektóre dane konta są nieprawidłowe", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "Aby zweryfikować swoje konto Twittera, wyślij poniższego tweeta (upewnij się, że cały tekst zawiera się w jednej linii):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "Aby zweryfikować swoją stronę umieść poniższą zawartość w katalogu głównym serwera pod adresem '.well-known/CloudIdVerificationCode.txt' (upewnij się, że cały tekst zawiera się w jednej linii):", diff --git a/apps/settings/l10n/pl.json b/apps/settings/l10n/pl.json index 676f5a93723..1e1205ce079 100644 --- a/apps/settings/l10n/pl.json +++ b/apps/settings/l10n/pl.json @@ -82,6 +82,7 @@ "Unable to change full name" : "Nie można zmienić pełnej nazwy", "Unable to change email address" : "Nie można zmienić adresu e-mail", "Unable to set invalid phone number" : "Nie można ustawić nieprawidłowego numeru telefonu", + "Unable to set invalid website" : "Nie można ustawić nieprawidłowej strony internetowej", "Some account data was invalid" : "Niektóre dane konta są nieprawidłowe", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "Aby zweryfikować swoje konto Twittera, wyślij poniższego tweeta (upewnij się, że cały tekst zawiera się w jednej linii):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "Aby zweryfikować swoją stronę umieść poniższą zawartość w katalogu głównym serwera pod adresem '.well-known/CloudIdVerificationCode.txt' (upewnij się, że cały tekst zawiera się w jednej linii):", diff --git a/apps/settings/l10n/pt_BR.js b/apps/settings/l10n/pt_BR.js index 89c8e81a53b..06be7d45387 100644 --- a/apps/settings/l10n/pt_BR.js +++ b/apps/settings/l10n/pt_BR.js @@ -84,6 +84,7 @@ OC.L10N.register( "Unable to change full name" : "Não foi possível alterar o nome completo", "Unable to change email address" : "Não foi possível alterar o endereço de e-mail", "Unable to set invalid phone number" : "Não é possível definir um número de telefone inválido", + "Unable to set invalid website" : "Incapaz de definir site inválido ", "Some account data was invalid" : "Alguns dados da conta eram inválidos", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "A fim de verificar sua conta no Twitter, poste o seguinte tweet no Twitter (certifique-se de postar sem nenhuma quebra de linha):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "A fim de verificar seu Website, armazene o seguinte conteúdo na página raiz em '.well-known/CloudIdVerificationCode.txt' (certifique-se que o texto inteiro esteja em uma só linha):", @@ -129,6 +130,7 @@ OC.L10N.register( "There are some user imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via \"occ security:certificates:import\" command. Their paths inside the data directory are shown below." : "Existem alguns certificados SSL importados pelo usuário presentes, que não são mais usados com o Nextcloud 21. Eles podem ser importados na linha de comando através do comando \"occ security:certificates:import\". Seus caminhos dentro do diretório de dados são mostrados abaixo.", "The old server-side-encryption format is enabled. We recommend disabling this." : "O antigo formato de criptografia do lado do servidor está ativado. Recomendamos desativar isso.", "MariaDB version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MariaDB 10.2 or higher." : "Está em uso o MariaDB versão \"%s\". O Nextcloud 21 terá mais suporte para essa versão e requer MariaDB 10.2 ou posterior.", + "MySQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MySQL 8.0 or MariaDB 10.2 or higher." : "Está sendo usado a versão \"%s\" do MySQL. Nextcloud 21 não suportará mais esta versão e irá requerer MySQL 8.0 ou MariaDB 10.2 ou superior. ", "PostgreSQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires PostgreSQL 9.6 or higher." : "Está em uso o PostgreSQL \"%s\". O Nextcloud 21 não terá mais suporte para essa versão e requer PostgreSQL 9.6 ou posterior.", "Nextcloud settings" : "Configurações Nextcloud", "Two-factor authentication can be enforced for all users and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "A autenticação de dois fatores pode ser imposta a todos os usuários e grupos específicos. Se eles não tiverem um provedor de dois fatores configurado, não poderão fazer login no sistema.", @@ -397,6 +399,7 @@ OC.L10N.register( "Check out our blog" : "Confira nosso blog", "Subscribe to our newsletter" : "Assine nosso boletim informativo", "Profile picture" : "Imagem do perfil", + "Change privacy level of profile picture" : "Alterar o nível de privacidade da foto do perfil ", "Upload new" : "Enviar novo", "Select from Files" : "Selecionar de Arquivos", "Remove image" : "Remover imagem", @@ -407,18 +410,24 @@ OC.L10N.register( "You are using <strong>%s</strong>" : "Você está usando <strong>%s</strong>", "You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)" : "Você está usando <strong>%1$s</strong> de <strong>%2$s</strong> (<strong>%3$s %%</strong>)", "Full name" : "Nome completo", + "Change privacy level of full name" : "Alterar o nível de privacidade do nome completo ", "No display name set" : "Nenhum nome de exibição definido", + "Change privacy level of email" : "Alterar o nível de privacidade do e-mail ", "Your email address" : "Seu endereço de e-mail", "No email address set" : "Nenhum endereço de e-mail foi configurado", "For password reset and notifications" : "Para redefinição de senha e notificações", "Phone number" : "Número de telefone", + "Change privacy level of phone number" : "Alterar o nível de privacidade do número de telefone ", "Your phone number" : "Seu número de telefone", "Address" : "Endereço", + "Change privacy level of address" : "Alterar o nível de privacidade do endereço ", "Your postal address" : "Seu endereço de correspondência", "Website" : "Website", + "Change privacy level of website" : "Alterar o nível de privacidade do site ", "It can take up to 24 hours before the account is displayed as verified." : "Pode levar até 24 horas para que a conta seja mostrada como verificada.", "Link https://…" : "Link https://…", "Twitter" : "Twitter", + "Change privacy level of Twitter profile" : "Alterar o nível de privacidade do perfil do Twitter ", "Twitter handle @…" : "Twitter handle @…", "Help translate" : "Ajude a traduzir", "Locale" : "Localização", diff --git a/apps/settings/l10n/pt_BR.json b/apps/settings/l10n/pt_BR.json index 81adc86d3d6..82316117233 100644 --- a/apps/settings/l10n/pt_BR.json +++ b/apps/settings/l10n/pt_BR.json @@ -82,6 +82,7 @@ "Unable to change full name" : "Não foi possível alterar o nome completo", "Unable to change email address" : "Não foi possível alterar o endereço de e-mail", "Unable to set invalid phone number" : "Não é possível definir um número de telefone inválido", + "Unable to set invalid website" : "Incapaz de definir site inválido ", "Some account data was invalid" : "Alguns dados da conta eram inválidos", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "A fim de verificar sua conta no Twitter, poste o seguinte tweet no Twitter (certifique-se de postar sem nenhuma quebra de linha):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "A fim de verificar seu Website, armazene o seguinte conteúdo na página raiz em '.well-known/CloudIdVerificationCode.txt' (certifique-se que o texto inteiro esteja em uma só linha):", @@ -127,6 +128,7 @@ "There are some user imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via \"occ security:certificates:import\" command. Their paths inside the data directory are shown below." : "Existem alguns certificados SSL importados pelo usuário presentes, que não são mais usados com o Nextcloud 21. Eles podem ser importados na linha de comando através do comando \"occ security:certificates:import\". Seus caminhos dentro do diretório de dados são mostrados abaixo.", "The old server-side-encryption format is enabled. We recommend disabling this." : "O antigo formato de criptografia do lado do servidor está ativado. Recomendamos desativar isso.", "MariaDB version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MariaDB 10.2 or higher." : "Está em uso o MariaDB versão \"%s\". O Nextcloud 21 terá mais suporte para essa versão e requer MariaDB 10.2 ou posterior.", + "MySQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MySQL 8.0 or MariaDB 10.2 or higher." : "Está sendo usado a versão \"%s\" do MySQL. Nextcloud 21 não suportará mais esta versão e irá requerer MySQL 8.0 ou MariaDB 10.2 ou superior. ", "PostgreSQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires PostgreSQL 9.6 or higher." : "Está em uso o PostgreSQL \"%s\". O Nextcloud 21 não terá mais suporte para essa versão e requer PostgreSQL 9.6 ou posterior.", "Nextcloud settings" : "Configurações Nextcloud", "Two-factor authentication can be enforced for all users and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "A autenticação de dois fatores pode ser imposta a todos os usuários e grupos específicos. Se eles não tiverem um provedor de dois fatores configurado, não poderão fazer login no sistema.", @@ -395,6 +397,7 @@ "Check out our blog" : "Confira nosso blog", "Subscribe to our newsletter" : "Assine nosso boletim informativo", "Profile picture" : "Imagem do perfil", + "Change privacy level of profile picture" : "Alterar o nível de privacidade da foto do perfil ", "Upload new" : "Enviar novo", "Select from Files" : "Selecionar de Arquivos", "Remove image" : "Remover imagem", @@ -405,18 +408,24 @@ "You are using <strong>%s</strong>" : "Você está usando <strong>%s</strong>", "You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)" : "Você está usando <strong>%1$s</strong> de <strong>%2$s</strong> (<strong>%3$s %%</strong>)", "Full name" : "Nome completo", + "Change privacy level of full name" : "Alterar o nível de privacidade do nome completo ", "No display name set" : "Nenhum nome de exibição definido", + "Change privacy level of email" : "Alterar o nível de privacidade do e-mail ", "Your email address" : "Seu endereço de e-mail", "No email address set" : "Nenhum endereço de e-mail foi configurado", "For password reset and notifications" : "Para redefinição de senha e notificações", "Phone number" : "Número de telefone", + "Change privacy level of phone number" : "Alterar o nível de privacidade do número de telefone ", "Your phone number" : "Seu número de telefone", "Address" : "Endereço", + "Change privacy level of address" : "Alterar o nível de privacidade do endereço ", "Your postal address" : "Seu endereço de correspondência", "Website" : "Website", + "Change privacy level of website" : "Alterar o nível de privacidade do site ", "It can take up to 24 hours before the account is displayed as verified." : "Pode levar até 24 horas para que a conta seja mostrada como verificada.", "Link https://…" : "Link https://…", "Twitter" : "Twitter", + "Change privacy level of Twitter profile" : "Alterar o nível de privacidade do perfil do Twitter ", "Twitter handle @…" : "Twitter handle @…", "Help translate" : "Ajude a traduzir", "Locale" : "Localização", diff --git a/apps/settings/l10n/tr.js b/apps/settings/l10n/tr.js index 126d00a8ef4..03015af31a5 100644 --- a/apps/settings/l10n/tr.js +++ b/apps/settings/l10n/tr.js @@ -84,6 +84,7 @@ OC.L10N.register( "Unable to change full name" : "Tam adınız değiştirilemedi", "Unable to change email address" : "E-posta adresi değiştirilemedi", "Unable to set invalid phone number" : "Telefon numarası geçersiz olduğundan ayarlanamadı", + "Unable to set invalid website" : "Web sitesi geçersiz olduğundan ayarlanamadı", "Some account data was invalid" : "Bazı hesap bilgileri geçersiz", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "Twitter hesabınızı doğrulamak için şu iletiyi Twitter üzerine gönderin (satır sonu olmadan gönderdiğinizden emin olun):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "Web sitenizi doğrulamak için şu içeriği web sitenizin kök klasörüne '.well-known/CloudIdVerificationCode.txt' dosyası içine ekleyin (tüm içeriğin tek bir satır olarak eklendiğinden emin olun):", diff --git a/apps/settings/l10n/tr.json b/apps/settings/l10n/tr.json index f3c055a8678..6dee0510f9d 100644 --- a/apps/settings/l10n/tr.json +++ b/apps/settings/l10n/tr.json @@ -82,6 +82,7 @@ "Unable to change full name" : "Tam adınız değiştirilemedi", "Unable to change email address" : "E-posta adresi değiştirilemedi", "Unable to set invalid phone number" : "Telefon numarası geçersiz olduğundan ayarlanamadı", + "Unable to set invalid website" : "Web sitesi geçersiz olduğundan ayarlanamadı", "Some account data was invalid" : "Bazı hesap bilgileri geçersiz", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "Twitter hesabınızı doğrulamak için şu iletiyi Twitter üzerine gönderin (satır sonu olmadan gönderdiğinizden emin olun):", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "Web sitenizi doğrulamak için şu içeriği web sitenizin kök klasörüne '.well-known/CloudIdVerificationCode.txt' dosyası içine ekleyin (tüm içeriğin tek bir satır olarak eklendiğinden emin olun):", diff --git a/apps/settings/l10n/zh_CN.js b/apps/settings/l10n/zh_CN.js index 5076858cbaf..1351380a3a6 100644 --- a/apps/settings/l10n/zh_CN.js +++ b/apps/settings/l10n/zh_CN.js @@ -84,6 +84,7 @@ OC.L10N.register( "Unable to change full name" : "无法修改全名", "Unable to change email address" : "无法修改电子邮箱地址", "Unable to set invalid phone number" : "无法设置有效的电话号码", + "Unable to set invalid website" : "无法设置无效的网站", "Some account data was invalid" : "一些账号数据无效", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "为了验证您的 Twitter 账号，请在 Twitter 上发布以下推文（请确保发布内容中没有任何换行符）：", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "为了验证您的网站，请将以下内容存储在“.well-known / CloudIdVerificationCode.txt”的网络根目录中（请确保完整的文本在一行中）：", diff --git a/apps/settings/l10n/zh_CN.json b/apps/settings/l10n/zh_CN.json index 66d0ceea20f..806f790e250 100644 --- a/apps/settings/l10n/zh_CN.json +++ b/apps/settings/l10n/zh_CN.json @@ -82,6 +82,7 @@ "Unable to change full name" : "无法修改全名", "Unable to change email address" : "无法修改电子邮箱地址", "Unable to set invalid phone number" : "无法设置有效的电话号码", + "Unable to set invalid website" : "无法设置无效的网站", "Some account data was invalid" : "一些账号数据无效", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "为了验证您的 Twitter 账号，请在 Twitter 上发布以下推文（请确保发布内容中没有任何换行符）：", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "为了验证您的网站，请将以下内容存储在“.well-known / CloudIdVerificationCode.txt”的网络根目录中（请确保完整的文本在一行中）：", diff --git a/apps/settings/l10n/zh_TW.js b/apps/settings/l10n/zh_TW.js index 486b46e9716..449cebb67ff 100644 --- a/apps/settings/l10n/zh_TW.js +++ b/apps/settings/l10n/zh_TW.js @@ -84,6 +84,7 @@ OC.L10N.register( "Unable to change full name" : "無法變更全名", "Unable to change email address" : "無法變更電子郵件地址", "Unable to set invalid phone number" : "無法設定無效的電話號碼", + "Unable to set invalid website" : "無法設定無效的網站", "Some account data was invalid" : "某些帳號資料無效", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "為了驗證您的推特帳號，請在推特上發佈下列推文（請確認推文內容沒有斷行）：", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "為了驗證您的網站，請將下列內容存至您網站的根目錄下路徑為「.well-known/CloudIdVerificationCode.txt」的檔案（請確保全文以一行的格式儲存）", diff --git a/apps/settings/l10n/zh_TW.json b/apps/settings/l10n/zh_TW.json index 43485cf2058..d0c52830609 100644 --- a/apps/settings/l10n/zh_TW.json +++ b/apps/settings/l10n/zh_TW.json @@ -82,6 +82,7 @@ "Unable to change full name" : "無法變更全名", "Unable to change email address" : "無法變更電子郵件地址", "Unable to set invalid phone number" : "無法設定無效的電話號碼", + "Unable to set invalid website" : "無法設定無效的網站", "Some account data was invalid" : "某些帳號資料無效", "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "為了驗證您的推特帳號，請在推特上發佈下列推文（請確認推文內容沒有斷行）：", "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "為了驗證您的網站，請將下列內容存至您網站的根目錄下路徑為「.well-known/CloudIdVerificationCode.txt」的檔案（請確保全文以一行的格式儲存）", diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index a568b350883..f4f364fe3e9 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -523,6 +523,9 @@ class UsersController extends Controller { if ($e->getMessage() === IAccountManager::PROPERTY_PHONE) { throw new \InvalidArgumentException($this->l10n->t('Unable to set invalid phone number')); } + if ($e->getMessage() === IAccountManager::PROPERTY_WEBSITE) { + throw new \InvalidArgumentException($this->l10n->t('Unable to set invalid website')); + } throw new \InvalidArgumentException($this->l10n->t('Some account data was invalid')); } } diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 166b7aae390..12c1be50272 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -642,7 +642,7 @@ class ShareByMailProvider implements IShareProvider { ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))) ->orderBy('id'); - $cursor = $qb->execute(); + $cursor = $qb->executeQuery(); while ($data = $cursor->fetch()) { $children[] = $this->createShareObject($data); } @@ -696,7 +696,7 @@ class ShareByMailProvider implements IShareProvider { */ $qb->setValue('file_target', $qb->createNamedParameter('')); - $qb->execute(); + $qb->executeUpdate(); return $qb->getLastInsertId(); } @@ -732,7 +732,7 @@ class ShareByMailProvider implements IShareProvider { ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE)) ->set('note', $qb->createNamedParameter($share->getNote())) ->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT)) - ->execute(); + ->executeUpdate(); if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') { $this->sendNote($share); @@ -822,7 +822,7 @@ class ShareByMailProvider implements IShareProvider { $qb->setFirstResult($offset); $qb->orderBy('id'); - $cursor = $qb->execute(); + $cursor = $qb->executeQuery(); $shares = []; while ($data = $cursor->fetch()) { $shares[] = $this->createShareObject($data); @@ -843,7 +843,7 @@ class ShareByMailProvider implements IShareProvider { ->where($qb->expr()->eq('id', $qb->createNamedParameter($id))) ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))); - $cursor = $qb->execute(); + $cursor = $qb->executeQuery(); $data = $cursor->fetch(); $cursor->closeCursor(); @@ -873,7 +873,7 @@ class ShareByMailProvider implements IShareProvider { ->from('share') ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId()))) ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))) - ->execute(); + ->executeQuery(); $shares = []; while ($data = $cursor->fetch()) { @@ -913,7 +913,7 @@ class ShareByMailProvider implements IShareProvider { $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId()))); } - $cursor = $qb->execute(); + $cursor = $qb->executeQuery(); while ($data = $cursor->fetch()) { $shares[] = $this->createShareObject($data); @@ -938,7 +938,7 @@ class ShareByMailProvider implements IShareProvider { ->from('share') ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))) ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token))) - ->execute(); + ->executeQuery(); $data = $cursor->fetch(); @@ -964,7 +964,7 @@ class ShareByMailProvider implements IShareProvider { $qb = $this->dbConnection->getQueryBuilder(); $qb->delete('share') ->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId))); - $qb->execute(); + $qb->executeUpdate(); } /** @@ -1058,7 +1058,7 @@ class ShareByMailProvider implements IShareProvider { $qb->delete('share') ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))) ->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid))) - ->execute(); + ->executeUpdate(); } /** @@ -1093,7 +1093,7 @@ class ShareByMailProvider implements IShareProvider { ->from('share') ->where($qb->expr()->eq('id', $qb->createNamedParameter($id))); - $cursor = $qb->execute(); + $cursor = $qb->executeQuery(); $data = $cursor->fetch(); $cursor->closeCursor(); @@ -1135,7 +1135,7 @@ class ShareByMailProvider implements IShareProvider { $qb->orderBy('id'); - $cursor = $qb->execute(); + $cursor = $qb->executeQuery(); $shares = []; while ($data = $cursor->fetch()) { $shares[$data['fileid']][] = $this->createShareObject($data); @@ -1164,7 +1164,7 @@ class ShareByMailProvider implements IShareProvider { $qb->expr()->eq('item_type', $qb->createNamedParameter('folder')) )) ->setMaxResults(1); - $cursor = $qb->execute(); + $cursor = $qb->executeQuery(); $mail = $cursor->fetch() !== false; $cursor->closeCursor(); @@ -1183,7 +1183,7 @@ class ShareByMailProvider implements IShareProvider { ) ); - $cursor = $qb->execute(); + $cursor = $qb->executeQuery(); while ($data = $cursor->fetch()) { try { $share = $this->createShareObject($data); diff --git a/apps/systemtags/l10n/es_419.js b/apps/systemtags/l10n/es_419.js index 3c12d8d2def..11a9d97607b 100644 --- a/apps/systemtags/l10n/es_419.js +++ b/apps/systemtags/l10n/es_419.js @@ -4,37 +4,37 @@ OC.L10N.register( "Update" : "Actualizar", "Create" : "Crear", "Select tag …" : "Seleccionar etiqueta ...", - "Added system tag {systemtag}" : "Etiqueta del sistema {systemtag} agregada", - "Added system tag %1$s" : "Etiqueta del sistema %1$s agregada", - "%1$s added system tag %2$s" : "%1$s agregó la etiqueta del sistema %2$s", - "{actor} added system tag {systemtag}" : "{actor} agregó la etiqueta del sistema {systemtag}", - "Removed system tag {systemtag}" : "Eliminó la etiqueta del sistema {systemtag}", - "Removed system tag %1$s" : "Etiqueta del sistema %1$s eliminada", - "%1$s removed system tag %2$s" : "%1$s eliminó la etiqueta del sistema %2$s", - "{actor} removed system tag {systemtag}" : "{actor} eliminó la etiqueta del sistema {systemtag}", - "You created system tag %1$s" : "Creaste la etiqueta del sistema %1$s", - "You created system tag {systemtag}" : "Creaste la etiqueta del sistema {systemtag}", - "%1$s created system tag %2$s" : "%1$s creo la etiqueta del sistema %2$s", - "{actor} created system tag {systemtag}" : "{actor} creó la etiqueta del sistema {systemtag}", - "You deleted system tag %1$s" : "Borraste la etiqueta del sistema %1$s", - "You deleted system tag {systemtag}" : "Borraste la etiqueta del sistema {systemtag}", - "%1$s deleted system tag %2$s" : "%1$s borró la etiqueta del sistema %2$s", - "{actor} deleted system tag {systemtag}" : "{actor} borró la etiqueta del sistema {systemtag}", - "You updated system tag %2$s to %1$s" : "Actualizaste la etiqueta del sistema %2$s a %1$s", - "You updated system tag {oldsystemtag} to {newsystemtag}" : "Actualizaste la etiqueta del sistema {oldsystemtag} a {newsystemtag}", - "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta del sistema %3$s a %2$s", - "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} actualizó la etiqueta del sistema {oldsystemtag} a {newsystemtag}", - "You added system tag %2$s to %1$s" : "Agregaste la etiqueta del sistema %2$s a %1$s", - "You added system tag {systemtag} to {file}" : "Agregaste la etiqueta del sistema {systemtag} a {file}", - "%1$s added system tag %3$s to %2$s" : "%1$s agregó la etiqueta del sistema %3$s a %2$s", - "{actor} added system tag {systemtag} to {file}" : "{actor} agregó la etiqueta del sistema {systemtag} a {file}", - "You removed system tag %2$s from %1$s" : "Eliminaste la etiqueta del sistema %2$s de %1$s", - "You removed system tag {systemtag} from {file}" : "Eliminaste la etiqueta del sistema {systemtag} de {file}", - "%1$s removed system tag %3$s from %2$s" : "%1$s eliminó la etiqueta del sistema %3$s de %2$s", - "{actor} removed system tag {systemtag} from {file}" : "{actor} eliminó la etiqueta del sistema {systemtag} de {file}", + "Added system tag {systemtag}" : "Etiqueta {systemtag} agregada", + "Added system tag %1$s" : "Etiqueta %1$s agregada", + "%1$s added system tag %2$s" : "%1$s agregó la etiqueta %2$s", + "{actor} added system tag {systemtag}" : "{actor} agregó la etiqueta {systemtag}", + "Removed system tag {systemtag}" : "Eliminó la etiqueta {systemtag}", + "Removed system tag %1$s" : "Etiqueta %1$s eliminada", + "%1$s removed system tag %2$s" : "%1$s eliminó la etiqueta %2$s", + "{actor} removed system tag {systemtag}" : "{actor} eliminó la etiqueta {systemtag}", + "You created system tag %1$s" : "Creaste la etiqueta %1$s", + "You created system tag {systemtag}" : "Creaste la etiqueta {systemtag}", + "%1$s created system tag %2$s" : "%1$s creó la etiqueta %2$s", + "{actor} created system tag {systemtag}" : "{actor} creó la etiqueta {systemtag}", + "You deleted system tag %1$s" : "Borraste la etiqueta %1$s", + "You deleted system tag {systemtag}" : "Borraste la etiqueta {systemtag}", + "%1$s deleted system tag %2$s" : "%1$s borró la etiqueta %2$s", + "{actor} deleted system tag {systemtag}" : "{actor} borró la etiqueta {systemtag}", + "You updated system tag %2$s to %1$s" : "Actualizaste la etiqueta %2$s a %1$s", + "You updated system tag {oldsystemtag} to {newsystemtag}" : "Actualizaste la etiqueta {oldsystemtag} a {newsystemtag}", + "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta %3$s a %2$s", + "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} actualizó la etiqueta {oldsystemtag} a {newsystemtag}", + "You added system tag %2$s to %1$s" : "Agregaste la etiqueta %2$s a %1$s", + "You added system tag {systemtag} to {file}" : "Agregaste la etiqueta {systemtag} a {file}", + "%1$s added system tag %3$s to %2$s" : "%1$s agregó la etiqueta %3$s a %2$s", + "{actor} added system tag {systemtag} to {file}" : "{actor} agregó la etiqueta {systemtag} a {file}", + "You removed system tag %2$s from %1$s" : "Eliminaste la etiqueta %2$s de %1$s", + "You removed system tag {systemtag} from {file}" : "Eliminaste la etiqueta {systemtag} de {file}", + "%1$s removed system tag %3$s from %2$s" : "%1$s eliminó la etiqueta %3$s de %2$s", + "{actor} removed system tag {systemtag} from {file}" : "{actor} eliminó la etiqueta {systemtag} de {file}", "%s (restricted)" : "%s (restringido)", "%s (invisible)" : "%s (invisible) ", - "<strong>System tags</strong> for a file have been modified" : "Las <strong>etiquetas del sistema</strong> para un archivo han sido modificadas", + "<strong>System tags</strong> for a file have been modified" : "Las <strong>etiquetas</strong> para un archivo han sido modificadas", "Tags" : "Etiquetas", "Collaborative tags" : "Etiquetas colaborativas", "Tagged files" : "Archivos etiquetados", diff --git a/apps/systemtags/l10n/es_419.json b/apps/systemtags/l10n/es_419.json index a48ea2aaba7..9f7f4fe771e 100644 --- a/apps/systemtags/l10n/es_419.json +++ b/apps/systemtags/l10n/es_419.json @@ -2,37 +2,37 @@ "Update" : "Actualizar", "Create" : "Crear", "Select tag …" : "Seleccionar etiqueta ...", - "Added system tag {systemtag}" : "Etiqueta del sistema {systemtag} agregada", - "Added system tag %1$s" : "Etiqueta del sistema %1$s agregada", - "%1$s added system tag %2$s" : "%1$s agregó la etiqueta del sistema %2$s", - "{actor} added system tag {systemtag}" : "{actor} agregó la etiqueta del sistema {systemtag}", - "Removed system tag {systemtag}" : "Eliminó la etiqueta del sistema {systemtag}", - "Removed system tag %1$s" : "Etiqueta del sistema %1$s eliminada", - "%1$s removed system tag %2$s" : "%1$s eliminó la etiqueta del sistema %2$s", - "{actor} removed system tag {systemtag}" : "{actor} eliminó la etiqueta del sistema {systemtag}", - "You created system tag %1$s" : "Creaste la etiqueta del sistema %1$s", - "You created system tag {systemtag}" : "Creaste la etiqueta del sistema {systemtag}", - "%1$s created system tag %2$s" : "%1$s creo la etiqueta del sistema %2$s", - "{actor} created system tag {systemtag}" : "{actor} creó la etiqueta del sistema {systemtag}", - "You deleted system tag %1$s" : "Borraste la etiqueta del sistema %1$s", - "You deleted system tag {systemtag}" : "Borraste la etiqueta del sistema {systemtag}", - "%1$s deleted system tag %2$s" : "%1$s borró la etiqueta del sistema %2$s", - "{actor} deleted system tag {systemtag}" : "{actor} borró la etiqueta del sistema {systemtag}", - "You updated system tag %2$s to %1$s" : "Actualizaste la etiqueta del sistema %2$s a %1$s", - "You updated system tag {oldsystemtag} to {newsystemtag}" : "Actualizaste la etiqueta del sistema {oldsystemtag} a {newsystemtag}", - "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta del sistema %3$s a %2$s", - "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} actualizó la etiqueta del sistema {oldsystemtag} a {newsystemtag}", - "You added system tag %2$s to %1$s" : "Agregaste la etiqueta del sistema %2$s a %1$s", - "You added system tag {systemtag} to {file}" : "Agregaste la etiqueta del sistema {systemtag} a {file}", - "%1$s added system tag %3$s to %2$s" : "%1$s agregó la etiqueta del sistema %3$s a %2$s", - "{actor} added system tag {systemtag} to {file}" : "{actor} agregó la etiqueta del sistema {systemtag} a {file}", - "You removed system tag %2$s from %1$s" : "Eliminaste la etiqueta del sistema %2$s de %1$s", - "You removed system tag {systemtag} from {file}" : "Eliminaste la etiqueta del sistema {systemtag} de {file}", - "%1$s removed system tag %3$s from %2$s" : "%1$s eliminó la etiqueta del sistema %3$s de %2$s", - "{actor} removed system tag {systemtag} from {file}" : "{actor} eliminó la etiqueta del sistema {systemtag} de {file}", + "Added system tag {systemtag}" : "Etiqueta {systemtag} agregada", + "Added system tag %1$s" : "Etiqueta %1$s agregada", + "%1$s added system tag %2$s" : "%1$s agregó la etiqueta %2$s", + "{actor} added system tag {systemtag}" : "{actor} agregó la etiqueta {systemtag}", + "Removed system tag {systemtag}" : "Eliminó la etiqueta {systemtag}", + "Removed system tag %1$s" : "Etiqueta %1$s eliminada", + "%1$s removed system tag %2$s" : "%1$s eliminó la etiqueta %2$s", + "{actor} removed system tag {systemtag}" : "{actor} eliminó la etiqueta {systemtag}", + "You created system tag %1$s" : "Creaste la etiqueta %1$s", + "You created system tag {systemtag}" : "Creaste la etiqueta {systemtag}", + "%1$s created system tag %2$s" : "%1$s creó la etiqueta %2$s", + "{actor} created system tag {systemtag}" : "{actor} creó la etiqueta {systemtag}", + "You deleted system tag %1$s" : "Borraste la etiqueta %1$s", + "You deleted system tag {systemtag}" : "Borraste la etiqueta {systemtag}", + "%1$s deleted system tag %2$s" : "%1$s borró la etiqueta %2$s", + "{actor} deleted system tag {systemtag}" : "{actor} borró la etiqueta {systemtag}", + "You updated system tag %2$s to %1$s" : "Actualizaste la etiqueta %2$s a %1$s", + "You updated system tag {oldsystemtag} to {newsystemtag}" : "Actualizaste la etiqueta {oldsystemtag} a {newsystemtag}", + "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta %3$s a %2$s", + "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} actualizó la etiqueta {oldsystemtag} a {newsystemtag}", + "You added system tag %2$s to %1$s" : "Agregaste la etiqueta %2$s a %1$s", + "You added system tag {systemtag} to {file}" : "Agregaste la etiqueta {systemtag} a {file}", + "%1$s added system tag %3$s to %2$s" : "%1$s agregó la etiqueta %3$s a %2$s", + "{actor} added system tag {systemtag} to {file}" : "{actor} agregó la etiqueta {systemtag} a {file}", + "You removed system tag %2$s from %1$s" : "Eliminaste la etiqueta %2$s de %1$s", + "You removed system tag {systemtag} from {file}" : "Eliminaste la etiqueta {systemtag} de {file}", + "%1$s removed system tag %3$s from %2$s" : "%1$s eliminó la etiqueta %3$s de %2$s", + "{actor} removed system tag {systemtag} from {file}" : "{actor} eliminó la etiqueta {systemtag} de {file}", "%s (restricted)" : "%s (restringido)", "%s (invisible)" : "%s (invisible) ", - "<strong>System tags</strong> for a file have been modified" : "Las <strong>etiquetas del sistema</strong> para un archivo han sido modificadas", + "<strong>System tags</strong> for a file have been modified" : "Las <strong>etiquetas</strong> para un archivo han sido modificadas", "Tags" : "Etiquetas", "Collaborative tags" : "Etiquetas colaborativas", "Tagged files" : "Archivos etiquetados", diff --git a/apps/systemtags/l10n/es_AR.js b/apps/systemtags/l10n/es_AR.js index 489258f42b0..22f7f1e3653 100644 --- a/apps/systemtags/l10n/es_AR.js +++ b/apps/systemtags/l10n/es_AR.js @@ -4,37 +4,37 @@ OC.L10N.register( "Update" : "Actualizar", "Create" : "Crear", "Select tag …" : "Seleccionar etiqueta ...", - "Added system tag {systemtag}" : "Etiqueta del sistema {systemtag} agregada", - "Added system tag %1$s" : "Etiqueta del sistema %1$s agregada", - "%1$s added system tag %2$s" : "%1$s agregó la etiqueta del sistema %2$s", - "{actor} added system tag {systemtag}" : "{actor} agregó la etiqueta del sistema {systemtag}", - "Removed system tag {systemtag}" : "Eliminó la etiqueta del sistema {systemtag}", - "Removed system tag %1$s" : "Eliminó la etiqueta del sistema %1$s", - "%1$s removed system tag %2$s" : "%1$s eliminó la etiqueta del sistema %2$s", - "{actor} removed system tag {systemtag}" : "{actor} eliminó la etiqueta del sistema {systemtag}", - "You created system tag %1$s" : "Usted creó la etiqueta del sistema %1$s", - "You created system tag {systemtag}" : "Usted creó la etiqueta del sistema {systemtag}", - "%1$s created system tag %2$s" : "%1$s creo la etiqueta del sistema %2$s", - "{actor} created system tag {systemtag}" : "{actor} creó la etiqueta del sistema {systemtag}", - "You deleted system tag %1$s" : "Usted borró la etiqueta del sistema %1$s", - "You deleted system tag {systemtag}" : "Usted borró la etiqueta del sistema {systemtag}", - "%1$s deleted system tag %2$s" : "%1$s borró la etiqueta del sistema %2$s", - "{actor} deleted system tag {systemtag}" : "{actor} borró la etiqueta del sistema {systemtag}", - "You updated system tag %2$s to %1$s" : "Usted actualizó la etiqueta del sistema %2$s a %1$s", - "You updated system tag {oldsystemtag} to {newsystemtag}" : "Usted actualizó la etiqueta del sistema {oldsystemtag} a {newsystemtag}", - "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta del sistema %3$s a %2$s", - "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} actualizó la etiqueta del sistema {oldsystemtag} a {newsystemtag}", - "You added system tag %2$s to %1$s" : "Usted agregó la etiqueta del sistema %2$s a %1$s", - "You added system tag {systemtag} to {file}" : "Usted agregó la etiqueta del sistema {systemtag} a {file}", - "%1$s added system tag %3$s to %2$s" : "%1$s agregó la etiqueta del sistema %3$s a %2$s", - "{actor} added system tag {systemtag} to {file}" : "{actor} agregó la etiqueta del sistema {systemtag} a {file}", - "You removed system tag %2$s from %1$s" : "Usted eliminó la etiqueta del sistema %2$s de %1$s", - "You removed system tag {systemtag} from {file}" : "Usted eliminó la etiqueta del sistema {systemtag} de {file}", - "%1$s removed system tag %3$s from %2$s" : "%1$s eliminó la etiqueta del sistema %3$s de %2$s", - "{actor} removed system tag {systemtag} from {file}" : "{actor} eliminó la etiqueta del sistema {systemtag} de {file}", + "Added system tag {systemtag}" : "Etiqueta {systemtag} agregada", + "Added system tag %1$s" : "Etiqueta %1$s agregada", + "%1$s added system tag %2$s" : "%1$s agregó la etiqueta %2$s", + "{actor} added system tag {systemtag}" : "{actor} agregó la etiqueta {systemtag}", + "Removed system tag {systemtag}" : "Eliminó la etiqueta {systemtag}", + "Removed system tag %1$s" : "Etiqueta %1$s eliminada", + "%1$s removed system tag %2$s" : "%1$s eliminó la etiqueta %2$s", + "{actor} removed system tag {systemtag}" : "{actor} eliminó la etiqueta {systemtag}", + "You created system tag %1$s" : "Creaste la etiqueta %1$s", + "You created system tag {systemtag}" : "Creaste la etiqueta {systemtag}", + "%1$s created system tag %2$s" : "%1$s creó la etiqueta %2$s", + "{actor} created system tag {systemtag}" : "{actor} creó la etiqueta {systemtag}", + "You deleted system tag %1$s" : "Borraste la etiqueta %1$s", + "You deleted system tag {systemtag}" : "Borraste la etiqueta {systemtag}", + "%1$s deleted system tag %2$s" : "%1$s borró la etiqueta %2$s", + "{actor} deleted system tag {systemtag}" : "{actor} borró la etiqueta {systemtag}", + "You updated system tag %2$s to %1$s" : "Actualizaste la etiqueta %2$s a %1$s", + "You updated system tag {oldsystemtag} to {newsystemtag}" : "Actualizaste la etiqueta {oldsystemtag} a {newsystemtag}", + "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta %3$s a %2$s", + "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} actualizó la etiqueta {oldsystemtag} a {newsystemtag}", + "You added system tag %2$s to %1$s" : "Agregaste la etiqueta %2$s a %1$s", + "You added system tag {systemtag} to {file}" : "Agregaste la etiqueta {systemtag} a {file}", + "%1$s added system tag %3$s to %2$s" : "%1$s agregó la etiqueta %3$s a %2$s", + "{actor} added system tag {systemtag} to {file}" : "{actor} agregó la etiqueta {systemtag} a {file}", + "You removed system tag %2$s from %1$s" : "Eliminaste la etiqueta %2$s de %1$s", + "You removed system tag {systemtag} from {file}" : "Eliminaste la etiqueta {systemtag} de {file}", + "%1$s removed system tag %3$s from %2$s" : "%1$s eliminó la etiqueta %3$s de %2$s", + "{actor} removed system tag {systemtag} from {file}" : "{actor} eliminó la etiqueta {systemtag} de {file}", "%s (restricted)" : "%s (restringido)", "%s (invisible)" : "%s (invisible) ", - "<strong>System tags</strong> for a file have been modified" : "Las <strong>etiquetas del sistema</strong> para un archivo han sido modificadas", + "<strong>System tags</strong> for a file have been modified" : "Las <strong>etiquetas</strong> para un archivo han sido modificadas", "Tags" : "Etiquetas", "Collaborative tags" : "Etiquetas colaborativas", "Tagged files" : "Archivos etiquetados", diff --git a/apps/systemtags/l10n/es_AR.json b/apps/systemtags/l10n/es_AR.json index aa4fb10a42c..e1fc5213eb9 100644 --- a/apps/systemtags/l10n/es_AR.json +++ b/apps/systemtags/l10n/es_AR.json @@ -2,37 +2,37 @@ "Update" : "Actualizar", "Create" : "Crear", "Select tag …" : "Seleccionar etiqueta ...", - "Added system tag {systemtag}" : "Etiqueta del sistema {systemtag} agregada", - "Added system tag %1$s" : "Etiqueta del sistema %1$s agregada", - "%1$s added system tag %2$s" : "%1$s agregó la etiqueta del sistema %2$s", - "{actor} added system tag {systemtag}" : "{actor} agregó la etiqueta del sistema {systemtag}", - "Removed system tag {systemtag}" : "Eliminó la etiqueta del sistema {systemtag}", - "Removed system tag %1$s" : "Eliminó la etiqueta del sistema %1$s", - "%1$s removed system tag %2$s" : "%1$s eliminó la etiqueta del sistema %2$s", - "{actor} removed system tag {systemtag}" : "{actor} eliminó la etiqueta del sistema {systemtag}", - "You created system tag %1$s" : "Usted creó la etiqueta del sistema %1$s", - "You created system tag {systemtag}" : "Usted creó la etiqueta del sistema {systemtag}", - "%1$s created system tag %2$s" : "%1$s creo la etiqueta del sistema %2$s", - "{actor} created system tag {systemtag}" : "{actor} creó la etiqueta del sistema {systemtag}", - "You deleted system tag %1$s" : "Usted borró la etiqueta del sistema %1$s", - "You deleted system tag {systemtag}" : "Usted borró la etiqueta del sistema {systemtag}", - "%1$s deleted system tag %2$s" : "%1$s borró la etiqueta del sistema %2$s", - "{actor} deleted system tag {systemtag}" : "{actor} borró la etiqueta del sistema {systemtag}", - "You updated system tag %2$s to %1$s" : "Usted actualizó la etiqueta del sistema %2$s a %1$s", - "You updated system tag {oldsystemtag} to {newsystemtag}" : "Usted actualizó la etiqueta del sistema {oldsystemtag} a {newsystemtag}", - "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta del sistema %3$s a %2$s", - "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} actualizó la etiqueta del sistema {oldsystemtag} a {newsystemtag}", - "You added system tag %2$s to %1$s" : "Usted agregó la etiqueta del sistema %2$s a %1$s", - "You added system tag {systemtag} to {file}" : "Usted agregó la etiqueta del sistema {systemtag} a {file}", - "%1$s added system tag %3$s to %2$s" : "%1$s agregó la etiqueta del sistema %3$s a %2$s", - "{actor} added system tag {systemtag} to {file}" : "{actor} agregó la etiqueta del sistema {systemtag} a {file}", - "You removed system tag %2$s from %1$s" : "Usted eliminó la etiqueta del sistema %2$s de %1$s", - "You removed system tag {systemtag} from {file}" : "Usted eliminó la etiqueta del sistema {systemtag} de {file}", - "%1$s removed system tag %3$s from %2$s" : "%1$s eliminó la etiqueta del sistema %3$s de %2$s", - "{actor} removed system tag {systemtag} from {file}" : "{actor} eliminó la etiqueta del sistema {systemtag} de {file}", + "Added system tag {systemtag}" : "Etiqueta {systemtag} agregada", + "Added system tag %1$s" : "Etiqueta %1$s agregada", + "%1$s added system tag %2$s" : "%1$s agregó la etiqueta %2$s", + "{actor} added system tag {systemtag}" : "{actor} agregó la etiqueta {systemtag}", + "Removed system tag {systemtag}" : "Eliminó la etiqueta {systemtag}", + "Removed system tag %1$s" : "Etiqueta %1$s eliminada", + "%1$s removed system tag %2$s" : "%1$s eliminó la etiqueta %2$s", + "{actor} removed system tag {systemtag}" : "{actor} eliminó la etiqueta {systemtag}", + "You created system tag %1$s" : "Creaste la etiqueta %1$s", + "You created system tag {systemtag}" : "Creaste la etiqueta {systemtag}", + "%1$s created system tag %2$s" : "%1$s creó la etiqueta %2$s", + "{actor} created system tag {systemtag}" : "{actor} creó la etiqueta {systemtag}", + "You deleted system tag %1$s" : "Borraste la etiqueta %1$s", + "You deleted system tag {systemtag}" : "Borraste la etiqueta {systemtag}", + "%1$s deleted system tag %2$s" : "%1$s borró la etiqueta %2$s", + "{actor} deleted system tag {systemtag}" : "{actor} borró la etiqueta {systemtag}", + "You updated system tag %2$s to %1$s" : "Actualizaste la etiqueta %2$s a %1$s", + "You updated system tag {oldsystemtag} to {newsystemtag}" : "Actualizaste la etiqueta {oldsystemtag} a {newsystemtag}", + "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta %3$s a %2$s", + "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} actualizó la etiqueta {oldsystemtag} a {newsystemtag}", + "You added system tag %2$s to %1$s" : "Agregaste la etiqueta %2$s a %1$s", + "You added system tag {systemtag} to {file}" : "Agregaste la etiqueta {systemtag} a {file}", + "%1$s added system tag %3$s to %2$s" : "%1$s agregó la etiqueta %3$s a %2$s", + "{actor} added system tag {systemtag} to {file}" : "{actor} agregó la etiqueta {systemtag} a {file}", + "You removed system tag %2$s from %1$s" : "Eliminaste la etiqueta %2$s de %1$s", + "You removed system tag {systemtag} from {file}" : "Eliminaste la etiqueta {systemtag} de {file}", + "%1$s removed system tag %3$s from %2$s" : "%1$s eliminó la etiqueta %3$s de %2$s", + "{actor} removed system tag {systemtag} from {file}" : "{actor} eliminó la etiqueta {systemtag} de {file}", "%s (restricted)" : "%s (restringido)", "%s (invisible)" : "%s (invisible) ", - "<strong>System tags</strong> for a file have been modified" : "Las <strong>etiquetas del sistema</strong> para un archivo han sido modificadas", + "<strong>System tags</strong> for a file have been modified" : "Las <strong>etiquetas</strong> para un archivo han sido modificadas", "Tags" : "Etiquetas", "Collaborative tags" : "Etiquetas colaborativas", "Tagged files" : "Archivos etiquetados", diff --git a/apps/user_ldap/composer/composer/autoload_classmap.php b/apps/user_ldap/composer/composer/autoload_classmap.php index 509738674a1..45af1123b57 100644 --- a/apps/user_ldap/composer/composer/autoload_classmap.php +++ b/apps/user_ldap/composer/composer/autoload_classmap.php @@ -29,6 +29,7 @@ return array( 'OCA\\User_LDAP\\Events\\UserBackendRegistered' => $baseDir . '/../lib/Events/UserBackendRegistered.php', 'OCA\\User_LDAP\\Exceptions\\AttributeNotSet' => $baseDir . '/../lib/Exceptions/AttributeNotSet.php', 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir . '/../lib/Exceptions/ConstraintViolationException.php', + 'OCA\\User_LDAP\\Exceptions\\NoMoreResults' => $baseDir . '/../lib/Exceptions/NoMoreResults.php', 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir . '/../lib/Exceptions/NotOnLDAP.php', 'OCA\\User_LDAP\\FilesystemHelper' => $baseDir . '/../lib/FilesystemHelper.php', 'OCA\\User_LDAP\\GroupPluginManager' => $baseDir . '/../lib/GroupPluginManager.php', @@ -61,7 +62,6 @@ return array( 'OCA\\User_LDAP\\Migration\\Version1010Date20200630192842' => $baseDir . '/../lib/Migration/Version1010Date20200630192842.php', 'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php', 'OCA\\User_LDAP\\PagedResults\\IAdapter' => $baseDir . '/../lib/PagedResults/IAdapter.php', - 'OCA\\User_LDAP\\PagedResults\\Php54' => $baseDir . '/../lib/PagedResults/Php54.php', 'OCA\\User_LDAP\\PagedResults\\Php73' => $baseDir . '/../lib/PagedResults/Php73.php', 'OCA\\User_LDAP\\PagedResults\\TLinkId' => $baseDir . '/../lib/PagedResults/TLinkId.php', 'OCA\\User_LDAP\\Proxy' => $baseDir . '/../lib/Proxy.php', diff --git a/apps/user_ldap/composer/composer/autoload_static.php b/apps/user_ldap/composer/composer/autoload_static.php index fc8b0685875..bf95d3a5a03 100644 --- a/apps/user_ldap/composer/composer/autoload_static.php +++ b/apps/user_ldap/composer/composer/autoload_static.php @@ -44,6 +44,7 @@ class ComposerStaticInitUser_LDAP 'OCA\\User_LDAP\\Events\\UserBackendRegistered' => __DIR__ . '/..' . '/../lib/Events/UserBackendRegistered.php', 'OCA\\User_LDAP\\Exceptions\\AttributeNotSet' => __DIR__ . '/..' . '/../lib/Exceptions/AttributeNotSet.php', 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => __DIR__ . '/..' . '/../lib/Exceptions/ConstraintViolationException.php', + 'OCA\\User_LDAP\\Exceptions\\NoMoreResults' => __DIR__ . '/..' . '/../lib/Exceptions/NoMoreResults.php', 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => __DIR__ . '/..' . '/../lib/Exceptions/NotOnLDAP.php', 'OCA\\User_LDAP\\FilesystemHelper' => __DIR__ . '/..' . '/../lib/FilesystemHelper.php', 'OCA\\User_LDAP\\GroupPluginManager' => __DIR__ . '/..' . '/../lib/GroupPluginManager.php', @@ -76,7 +77,6 @@ class ComposerStaticInitUser_LDAP 'OCA\\User_LDAP\\Migration\\Version1010Date20200630192842' => __DIR__ . '/..' . '/../lib/Migration/Version1010Date20200630192842.php', 'OCA\\User_LDAP\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php', 'OCA\\User_LDAP\\PagedResults\\IAdapter' => __DIR__ . '/..' . '/../lib/PagedResults/IAdapter.php', - 'OCA\\User_LDAP\\PagedResults\\Php54' => __DIR__ . '/..' . '/../lib/PagedResults/Php54.php', 'OCA\\User_LDAP\\PagedResults\\Php73' => __DIR__ . '/..' . '/../lib/PagedResults/Php73.php', 'OCA\\User_LDAP\\PagedResults\\TLinkId' => __DIR__ . '/..' . '/../lib/PagedResults/TLinkId.php', 'OCA\\User_LDAP\\Proxy' => __DIR__ . '/..' . '/../lib/Proxy.php', diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js index 417a9655b89..ba28ce79ef0 100644 --- a/apps/user_ldap/l10n/pl.js +++ b/apps/user_ldap/l10n/pl.js @@ -5,7 +5,7 @@ OC.L10N.register( "Failed to delete the server configuration" : "Nie można usunąć konfiguracji serwera", "Invalid configuration: Anonymous binding is not allowed." : "Nieprawidłowa konfiguracja: Anonimowe podpinanie jest niedozwolone.", "Valid configuration, connection established!" : "Konfiguracja poprawna, połączenie ustanowione!", - "Valid configuration, but binding failed. Please check the server settings and credentials." : "Konfiguracja prawidłowa, ale podpinanie nie powiodło się. Sprawdź konfigurację serwera i poświadczenia.", + "Valid configuration, but binding failed. Please check the server settings and credentials." : "Konfiguracja poprawna, ale powiązanie nie powiodło się. Sprawdź konfigurację serwera i poświadczenia.", "Invalid configuration. Please have a look at the logs for further details." : "Nieprawidłowa konfiguracja. Sprawdź logi po więcej szczegółów.", "No action specified" : "Nie określono akcji", "No configuration specified" : "Nie określono konfiguracji", @@ -64,7 +64,7 @@ OC.L10N.register( "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników","%s znalezionych użytkowników"], "Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings." : "Nie można wykryć atrybutu wyświetlania nazwy użytkownika.", "Could not find the desired feature" : "Nie można znaleźć żądanej funkcji", - "Invalid Host" : "Niepoprawny Host", + "Invalid Host" : "Nieprawidłowy host", "LDAP user and group backend" : "Zaplecze użytkowników i grup LDAP", "This application enables administrators to connect Nextcloud to an LDAP-based user directory." : "Ta aplikacja umożliwia administratorom podłączenie Nextcloud do katalogu użytkownika opartego na LDAP.", "This application enables administrators to connect Nextcloud to an LDAP-based user directory for authentication and provisioning users, groups and user attributes. Admins can configure this application to connect to one or more LDAP directories or Active Directories via an LDAP interface. Attributes such as user quota, email, avatar pictures, group memberships and more can be pulled into Nextcloud from a directory with the appropriate queries and filters.\n\nA user logs into Nextcloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. Nextcloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then Nextcloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation." : "Ta aplikacja umożliwia administratorom łączenie Nextcloud z katalogiem użytkowników opartym na LDAP w celu uwierzytelniania i udostępniania użytkowników, grup i atrybutów użytkowników. Administratorzy mogą skonfigurować tę aplikację do łączenia się z jednym lub większą liczbą katalogów LDAP lub katalogów aktywnych za pośrednictwem interfejsu LDAP. Atrybuty, takie jak limity użytkowników, wiadomości e-mail, zdjęcia awatarów, członkostwa w grupach i inne, można pobrać do Nextcloud z katalogu z odpowiednimi zapytaniami i filtrami.\n\nUżytkownik loguje się do Nextcloud za pomocą swoich poświadczeń LDAP lub AD i uzyskuje dostęp na podstawie żądania uwierzytelnienia obsługiwanego przez serwer LDAP lub AD. Nextcloud nie przechowuje haseł LDAP lub AD, poświadczenia te są użyte do uwierzytelnienia użytkownika. Następnie Nextcloud używa sesji dla ID użytkownika. Więcej informacji można znaleźć w dokumentacji użytkownika LDAP i zaplecza grupy.", diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json index aafd73452ae..487d6106532 100644 --- a/apps/user_ldap/l10n/pl.json +++ b/apps/user_ldap/l10n/pl.json @@ -3,7 +3,7 @@ "Failed to delete the server configuration" : "Nie można usunąć konfiguracji serwera", "Invalid configuration: Anonymous binding is not allowed." : "Nieprawidłowa konfiguracja: Anonimowe podpinanie jest niedozwolone.", "Valid configuration, connection established!" : "Konfiguracja poprawna, połączenie ustanowione!", - "Valid configuration, but binding failed. Please check the server settings and credentials." : "Konfiguracja prawidłowa, ale podpinanie nie powiodło się. Sprawdź konfigurację serwera i poświadczenia.", + "Valid configuration, but binding failed. Please check the server settings and credentials." : "Konfiguracja poprawna, ale powiązanie nie powiodło się. Sprawdź konfigurację serwera i poświadczenia.", "Invalid configuration. Please have a look at the logs for further details." : "Nieprawidłowa konfiguracja. Sprawdź logi po więcej szczegółów.", "No action specified" : "Nie określono akcji", "No configuration specified" : "Nie określono konfiguracji", @@ -62,7 +62,7 @@ "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników","%s znalezionych użytkowników"], "Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings." : "Nie można wykryć atrybutu wyświetlania nazwy użytkownika.", "Could not find the desired feature" : "Nie można znaleźć żądanej funkcji", - "Invalid Host" : "Niepoprawny Host", + "Invalid Host" : "Nieprawidłowy host", "LDAP user and group backend" : "Zaplecze użytkowników i grup LDAP", "This application enables administrators to connect Nextcloud to an LDAP-based user directory." : "Ta aplikacja umożliwia administratorom podłączenie Nextcloud do katalogu użytkownika opartego na LDAP.", "This application enables administrators to connect Nextcloud to an LDAP-based user directory for authentication and provisioning users, groups and user attributes. Admins can configure this application to connect to one or more LDAP directories or Active Directories via an LDAP interface. Attributes such as user quota, email, avatar pictures, group memberships and more can be pulled into Nextcloud from a directory with the appropriate queries and filters.\n\nA user logs into Nextcloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. Nextcloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then Nextcloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation." : "Ta aplikacja umożliwia administratorom łączenie Nextcloud z katalogiem użytkowników opartym na LDAP w celu uwierzytelniania i udostępniania użytkowników, grup i atrybutów użytkowników. Administratorzy mogą skonfigurować tę aplikację do łączenia się z jednym lub większą liczbą katalogów LDAP lub katalogów aktywnych za pośrednictwem interfejsu LDAP. Atrybuty, takie jak limity użytkowników, wiadomości e-mail, zdjęcia awatarów, członkostwa w grupach i inne, można pobrać do Nextcloud z katalogu z odpowiednimi zapytaniami i filtrami.\n\nUżytkownik loguje się do Nextcloud za pomocą swoich poświadczeń LDAP lub AD i uzyskuje dostęp na podstawie żądania uwierzytelnienia obsługiwanego przez serwer LDAP lub AD. Nextcloud nie przechowuje haseł LDAP lub AD, poświadczenia te są użyte do uwierzytelnienia użytkownika. Następnie Nextcloud używa sesji dla ID użytkownika. Więcej informacji można znaleźć w dokumentacji użytkownika LDAP i zaplecza grupy.", diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js index 23aed1fa04d..3bfc51ede43 100644 --- a/apps/user_ldap/l10n/pt_BR.js +++ b/apps/user_ldap/l10n/pt_BR.js @@ -180,6 +180,7 @@ OC.L10N.register( "\"$home\" Placeholder Field" : "Campo Reservado \"$home\"", "$home in an external storage configuration will be replaced with the value of the specified attribute" : "$home em uma configuração de armazenamento externo será substituído pelo valor do atributo especificado", "Internal Username" : "Nome de usuário 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. Changes will have effect only on newly mapped (added) LDAP users. Leave it empty for default behavior." : "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Isso garante que o nome de usuário seja único e os caracteres não precisem ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9 _. @ -]. Outros caracteres são substituídos por sua correspondência ASCII ou simplesmente omitidos. Em colisões, um número será adicionado / aumentado. O nome de usuário interno é usado para identificar um usuário internamente. É também o nome padrão da pasta inicial do usuário. Também faz parte de URLs remotos, por exemplo, para todos os serviços * DAV. Com essa configuração, o comportamento padrão pode ser substituído. As alterações terão efeito apenas em usuários LDAP recém-mapeados (adicionados). Deixe em branco para o comportamento padrão.", "Internal Username Attribute:" : "Atributo Interno de Nome de Usuário:", "Override UUID detection" : "Substituir detecção 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 padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar corretamente os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto por usuários quanto por grupos, e que seja único. Deixe-o em branco para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados).", diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json index 459898bec28..35512456d55 100644 --- a/apps/user_ldap/l10n/pt_BR.json +++ b/apps/user_ldap/l10n/pt_BR.json @@ -178,6 +178,7 @@ "\"$home\" Placeholder Field" : "Campo Reservado \"$home\"", "$home in an external storage configuration will be replaced with the value of the specified attribute" : "$home em uma configuração de armazenamento externo será substituído pelo valor do atributo especificado", "Internal Username" : "Nome de usuário 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. Changes will have effect only on newly mapped (added) LDAP users. Leave it empty for default behavior." : "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Isso garante que o nome de usuário seja único e os caracteres não precisem ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9 _. @ -]. Outros caracteres são substituídos por sua correspondência ASCII ou simplesmente omitidos. Em colisões, um número será adicionado / aumentado. O nome de usuário interno é usado para identificar um usuário internamente. É também o nome padrão da pasta inicial do usuário. Também faz parte de URLs remotos, por exemplo, para todos os serviços * DAV. Com essa configuração, o comportamento padrão pode ser substituído. As alterações terão efeito apenas em usuários LDAP recém-mapeados (adicionados). Deixe em branco para o comportamento padrão.", "Internal Username Attribute:" : "Atributo Interno de Nome de Usuário:", "Override UUID detection" : "Substituir detecção 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 padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar corretamente os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto por usuários quanto por grupos, e que seja único. Deixe-o em branco para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados).", diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 9f317d6c642..b7c9b486668 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -52,6 +52,7 @@ use OC\HintException; use OC\Hooks\PublicEmitter; use OC\ServerNotAvailableException; use OCA\User_LDAP\Exceptions\ConstraintViolationException; +use OCA\User_LDAP\Exceptions\NoMoreResults; use OCA\User_LDAP\Mapping\AbstractMapping; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User\Manager; @@ -264,7 +265,14 @@ class Access extends LDAPUtility { * @throws ServerNotAvailableException */ public function executeRead($cr, $dn, $attribute, $filter, $maxResults) { - $this->initPagedSearch($filter, $dn, [$attribute], $maxResults, 0); + try { + $this->initPagedSearch($filter, $dn, [$attribute], $maxResults, 0); + } catch (NoMoreResults $e) { + // does not happen, no pagination here since offset is 0, but the + // previous call is needed for a potential reset of the state. + // Tools would still point out a possible NoMoreResults exception. + return false; + } $dn = $this->helper->DNasBaseParameter($dn); $rr = @$this->invokeLDAPMethod('read', $cr, $dn, $filter, [$attribute]); if (!$this->ldap->isResource($rr)) { @@ -1143,7 +1151,12 @@ class Access extends LDAPUtility { } //check whether paged search should be attempted - $pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, (int)$limit, (int)$offset); + try { + $pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, (int)$limit, (int)$offset); + } catch (NoMoreResults $e) { + // beyond last results page + return false; + } $sr = $this->invokeLDAPMethod('search', $cr, $base, $filter, $attr); // cannot use $cr anymore, might have changed in the previous call! @@ -1996,6 +2009,7 @@ class Access extends LDAPUtility { * @param int $offset * @return bool|true * @throws ServerNotAvailableException + * @throws NoMoreResults */ private function initPagedSearch( string $filter, @@ -2027,7 +2041,7 @@ class Access extends LDAPUtility { if (!$this->hasMoreResults()) { // when the cookie is reset with != 0 offset, there are no further // results, so stop. - return false; + throw new NoMoreResults(); } } if ($this->lastCookie !== '' && $offset === 0) { diff --git a/apps/user_ldap/lib/Exceptions/NoMoreResults.php b/apps/user_ldap/lib/Exceptions/NoMoreResults.php new file mode 100644 index 00000000000..cf04a155bd9 --- /dev/null +++ b/apps/user_ldap/lib/Exceptions/NoMoreResults.php @@ -0,0 +1,30 @@ +<?php + +declare(strict_types=1); + +/** + * @copyright Copyright (c) 2021 Arthur Schiwon <blizzz@arthur-schiwon.de> + * + * @author Arthur Schiwon <blizzz@arthur-schiwon.de> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * + */ + +namespace OCA\User_LDAP\Exceptions; + +class NoMoreResults extends \Exception { +} diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php index bd1b7b01e4f..6586484d7ce 100644 --- a/apps/user_ldap/lib/LDAP.php +++ b/apps/user_ldap/lib/LDAP.php @@ -36,7 +36,6 @@ namespace OCA\User_LDAP; use OC\ServerNotAvailableException; use OCA\User_LDAP\Exceptions\ConstraintViolationException; use OCA\User_LDAP\PagedResults\IAdapter; -use OCA\User_LDAP\PagedResults\Php54; use OCA\User_LDAP\PagedResults\Php73; class LDAP implements ILDAPWrapper { @@ -47,11 +46,7 @@ class LDAP implements ILDAPWrapper { protected $pagedResultsAdapter; public function __construct() { - if (version_compare(PHP_VERSION, '7.3', '<') === true) { - $this->pagedResultsAdapter = new Php54(); - } else { - $this->pagedResultsAdapter = new Php73(); - } + $this->pagedResultsAdapter = new Php73(); } /** diff --git a/apps/user_ldap/lib/PagedResults/Php54.php b/apps/user_ldap/lib/PagedResults/Php54.php deleted file mode 100644 index 55a5272f599..00000000000 --- a/apps/user_ldap/lib/PagedResults/Php54.php +++ /dev/null @@ -1,129 +0,0 @@ -<?php - -declare(strict_types=1); - -/** - * @copyright Copyright (c) 2020 Arthur Schiwon <blizzz@arthur-schiwon.de> - * - * @author Arthur Schiwon <blizzz@arthur-schiwon.de> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\User_LDAP\PagedResults; - -/** - * Class Php54 - * - * implements paged results support with PHP APIs available from PHP 5.4 - * - * @package OCA\User_LDAP\PagedResults - */ -class Php54 implements IAdapter { - use TLinkId; - - /** @var array */ - protected $linkData = []; - - public function getResponseCallFunc(): string { - return 'ldap_control_paged_result_response'; - } - - public function responseCall($link): bool { - $linkId = $this->getLinkId($link); - return ldap_control_paged_result_response(...$this->linkData[$linkId]['responseArgs']); - } - - public function getResponseCallArgs(array $originalArgs): array { - $linkId = $this->getLinkId($originalArgs[0]); - if (!isset($this->linkData[$linkId])) { - throw new \LogicException('There should be a request before the response'); - } - $this->linkData[$linkId]['responseArgs'] = &$originalArgs; - $this->linkData[$linkId]['cookie'] = &$originalArgs[2]; - return $originalArgs; - } - - public function getCookie($link): string { - $linkId = $this->getLinkId($link); - return $this->linkData[$linkId]['cookie']; - } - - public function getRequestCallFunc(): ?string { - return 'ldap_control_paged_result'; - } - - public function setRequestParameters($link, int $pageSize, bool $isCritical): void { - $linkId = $this->getLinkId($link); - - if ($pageSize === 0 || !isset($this->linkData[$linkId]['cookie'])) { - // abandons a previous paged search - $this->linkData[$linkId]['cookie'] = ''; - } - - $this->linkData[$linkId]['requestArgs'] = [ - $link, - $pageSize, - $isCritical, - &$this->linkData[$linkId]['cookie'] - ]; - } - - public function getRequestCallArgs($link): array { - $linkId = $this->getLinkId($link); - return $this->linkData[$linkId]['requestArgs']; - } - - public function requestCall($link): bool { - $linkId = $this->getLinkId($link); - return ldap_control_paged_result(...$this->linkData[$linkId]['requestArgs']); - } - - public function setSearchArgs( - $link, - string $baseDN, - string $filter, - array $attr, - int $attrsOnly, - int $limit - ): void { - $linkId = $this->getLinkId($link); - if (!isset($this->linkData[$linkId])) { - $this->linkData[$linkId] = []; - } - $this->linkData[$linkId]['searchArgs'] = func_get_args(); - } - - public function getSearchArgs($link): array { - $linkId = $this->getLinkId($link); - return $this->linkData[$linkId]['searchArgs']; - } - - public function setReadArgs($link, string $baseDN, string $filter, array $attr): void { - $linkId = $this->getLinkId($link); - if (!isset($this->linkData[$linkId])) { - $this->linkData[$linkId] = []; - } - $this->linkData[$linkId]['readArgs'] = func_get_args(); - } - - public function getReadArgs($link): array { - $linkId = $this->getLinkId($link); - return $this->linkData[$linkId]['readArgs']; - } -} diff --git a/apps/workflowengine/l10n/pl.js b/apps/workflowengine/l10n/pl.js index c7fff173127..a665f1639e3 100644 --- a/apps/workflowengine/l10n/pl.js +++ b/apps/workflowengine/l10n/pl.js @@ -2,7 +2,7 @@ OC.L10N.register( "workflowengine", { "The given operator is invalid" : "Dana operacja jest nieprawidłowa", - "The given regular expression is invalid" : "Podane wyrażenie regularne jest błędne", + "The given regular expression is invalid" : "Podane wyrażenie regularne jest nieprawidłowe", "The given file size is invalid" : "Podany rozmiar pliku jest nieprawidłowy", "The given tag id is invalid" : "Podane id etykiety jest nieprawidłowe", "The given IP range is invalid" : "Podany zakres adresów IP jest nieprawidłowy", diff --git a/apps/workflowengine/l10n/pl.json b/apps/workflowengine/l10n/pl.json index 5b0ea240206..57cfe0c1ebd 100644 --- a/apps/workflowengine/l10n/pl.json +++ b/apps/workflowengine/l10n/pl.json @@ -1,6 +1,6 @@ { "translations": { "The given operator is invalid" : "Dana operacja jest nieprawidłowa", - "The given regular expression is invalid" : "Podane wyrażenie regularne jest błędne", + "The given regular expression is invalid" : "Podane wyrażenie regularne jest nieprawidłowe", "The given file size is invalid" : "Podany rozmiar pliku jest nieprawidłowy", "The given tag id is invalid" : "Podane id etykiety jest nieprawidłowe", "The given IP range is invalid" : "Podany zakres adresów IP jest nieprawidłowy", diff --git a/build/integration/features/bootstrap/RemoteContext.php b/build/integration/features/bootstrap/RemoteContext.php index 38f3ab76487..69ebad43208 100644 --- a/build/integration/features/bootstrap/RemoteContext.php +++ b/build/integration/features/bootstrap/RemoteContext.php @@ -138,7 +138,13 @@ class RemoteContext implements Context { * @param string $value */ public function hasCapability($key, $value) { - $capabilities = $this->getApiClient()->getCapabilities(); + try { + $capabilities = $this->getApiClient()->getCapabilities(); + } catch (\Exception $e) { + Assert::assertInstanceOf($value, $e); + $this->lastException = $e; + return; + } $current = $capabilities; $parts = explode('.', $key); foreach ($parts as $part) { diff --git a/build/integration/remoteapi_features/remote.feature b/build/integration/remoteapi_features/remote.feature index 72daf8226cd..62fd95e0130 100644 --- a/build/integration/remoteapi_features/remote.feature +++ b/build/integration/remoteapi_features/remote.feature @@ -34,4 +34,5 @@ Feature: remote Given using remote server "REMOTE" And user "user0" exists And using credentials "user0", "invalid" - Then the capability "theming.name" is "Nextcloud" + Then the capability "theming.name" is "OC\ForbiddenException" + Then the request should throw a "OC\ForbiddenException" diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 3d00b20f2a1..34ea999d6fc 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1082,7 +1082,7 @@ <InvalidReturnType occurrences="1"> <code>string</code> </InvalidReturnType> - <InvalidScalarArgument occurrences="6"> + <InvalidScalarArgument occurrences="5"> <code>$id</code> <code>$id</code> <code>$id</code> @@ -2517,12 +2517,6 @@ <code>1</code> <code>1</code> </InvalidScalarArgument> - <UndefinedThisPropertyAssignment occurrences="1"> - <code>$this->installer</code> - </UndefinedThisPropertyAssignment> - <UndefinedThisPropertyFetch occurrences="1"> - <code>$this->installer</code> - </UndefinedThisPropertyFetch> </file> <file src="core/Command/User/Setting.php"> <InvalidScalarArgument occurrences="1"> diff --git a/console.php b/console.php index 88456a9bd77..4aa6e214cb7 100644 --- a/console.php +++ b/console.php @@ -93,7 +93,7 @@ try { \OC::$server->getConfig(), \OC::$server->getEventDispatcher(), \OC::$server->getRequest(), - \OC::$server->getLogger(), + \OC::$server->get(\Psr\Log\LoggerInterface::class), \OC::$server->query(\OC\MemoryInfo::class) ); $application->loadCommands(new ArgvInput(), new ConsoleOutput()); diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index fc219e79bcd..33bb967f08c 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -37,6 +37,7 @@ use OC\Installer; use OC\Setup; use OC\SystemConfig; use OCP\Defaults; +use Psr\Log\LoggerInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\InputInterface; @@ -85,7 +86,7 @@ class Install extends Command { $this->iniGetWrapper, $server->getL10N('lib'), $server->query(Defaults::class), - $server->getLogger(), + $server->get(LoggerInterface::class), $server->getSecureRandom(), \OC::$server->query(Installer::class) ); diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index 9dc1c4642b5..7ad3360c1bc 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -37,8 +37,8 @@ use OC\Console\TimestampFormatter; use OC\Installer; use OC\Updater; use OCP\IConfig; -use OCP\ILogger; use OCP\Util; +use Psr\Log\LoggerInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Input\InputInterface; @@ -56,15 +56,13 @@ class Upgrade extends Command { /** @var IConfig */ private $config; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; - /** - * @param IConfig $config - * @param ILogger $logger - * @param Installer $installer - */ - public function __construct(IConfig $config, ILogger $logger, Installer $installer) { + /** @var Installer */ + private $installer; + + public function __construct(IConfig $config, LoggerInterface $logger, Installer $installer) { parent::__construct(); $this->config = $config; $this->logger = $logger; diff --git a/core/ajax/update.php b/core/ajax/update.php index 6e655f42841..390ad0c2c47 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -117,7 +117,7 @@ if (\OCP\Util::needUpgrade()) { // avoid side effects \OC_User::setIncognitoMode(true); - $logger = \OC::$server->getLogger(); + $logger = \OC::$server->get(\Psr\Log\LoggerInterface::class); $config = \OC::$server->getConfig(); $updater = new \OC\Updater( $config, diff --git a/core/l10n/es_419.js b/core/l10n/es_419.js index dc509eddf42..090ccd85837 100644 --- a/core/l10n/es_419.js +++ b/core/l10n/es_419.js @@ -88,7 +88,7 @@ OC.L10N.register( "Back" : "Atrás", "Reset search" : "Reestablecer búsqueda", "Search" : "Buscar", - "Settings" : "Configuraciones ", + "Settings" : "Ajustes", "Search contacts …" : "Buscar contactos ...", "No contacts found" : "No se encontraron contactos", "Show all contacts …" : "Mostrar todos los contactos ...", diff --git a/core/l10n/es_419.json b/core/l10n/es_419.json index 68dd7b293b0..1cdcfc2fc82 100644 --- a/core/l10n/es_419.json +++ b/core/l10n/es_419.json @@ -86,7 +86,7 @@ "Back" : "Atrás", "Reset search" : "Reestablecer búsqueda", "Search" : "Buscar", - "Settings" : "Configuraciones ", + "Settings" : "Ajustes", "Search contacts …" : "Buscar contactos ...", "No contacts found" : "No se encontraron contactos", "Show all contacts …" : "Mostrar todos los contactos ...", diff --git a/core/l10n/eu.js b/core/l10n/eu.js index b74626a7ba2..4358cdbe8e0 100644 --- a/core/l10n/eu.js +++ b/core/l10n/eu.js @@ -131,6 +131,7 @@ OC.L10N.register( "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Eguneraketak huts egin du. Informazio gehiagorako <a href=\"{url}\">begiratu gure foroan arazoari buruzko sarrera</a>.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Eguneraketak huts egin du. Mesedez, jakinarazi arazoa <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud komunitateari</a>.", "Continue to {productName}" : "Jarraitu hona: {productName}", + "_The update was successful. Redirecting you to {productName} in %n second._::_The update was successful. Redirecting you to {productName} in %n seconds._" : ["Eguneraketa behar bezala egin da. {ProductName} ra birbideratuko zaitugu %nsegundotan.","Eguneraketa behar bezala egin da. {ProductName} ra birbideratuko zaitugu %n segundotan."], "Log in" : "Hasi saioa", "Logging in …" : "Saioa hasten...", "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!", @@ -139,6 +140,7 @@ OC.L10N.register( "Please try again or contact your administrator." : "Saiatu berriro edo jarri harremanetan administratzailearekin.", "Username or email" : "Erabiltzaile-izena edo e-posta", "Password" : "Pasahitza", + "Toggle password visibility" : "Txandakati pasahitzaren ikusgaitasuna", "Wrong username or password." : "Erabiltzaile-izen edo pasahitz okerra.", "User disabled" : "Erabiltzailea desgaituta", "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "Saioa hasteko hainbat saiakera baliogabe jaso ditugu zure IPtik. Ondorioz, zure hurrengo saio hasiera 30 segundo atzeratuko da.", @@ -146,6 +148,7 @@ OC.L10N.register( "Passwordless authentication is not supported in your browser." : "Zure nabigatzaileak ez du pasahitzik gabeko autentifikaziorik onartzen.", "Passwordless authentication is only available over a secure connection." : "Pasahitzik gabeko autentifikazioa konexio seguruetan erabil daiteke soilik.", "Reset password" : "Berrezarri pasahitza", + "A password reset message has been sent to the email address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help." : "Pasahitza berrezartzeko mezu bat bidali da kontu honen helbide elektronikora. Jasotzen ez baduzu, egiaztatu spam/zabor karpetak edo eskatu laguntza administratzaile lokalari.", "If it is not there ask your local administrator." : "Han ez badago, galdetu zure administratzaile lokalari.", "Couldn't send reset email. Please contact your administrator." : "Ezin izan da berrezartzeko e-posta bidali. Jarri zure administratzailearekin harremanetan.", "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Jarri zure administratzailearekin harremanetan.", diff --git a/core/l10n/eu.json b/core/l10n/eu.json index ed545ec25ee..23ab789ccbd 100644 --- a/core/l10n/eu.json +++ b/core/l10n/eu.json @@ -129,6 +129,7 @@ "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Eguneraketak huts egin du. Informazio gehiagorako <a href=\"{url}\">begiratu gure foroan arazoari buruzko sarrera</a>.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Eguneraketak huts egin du. Mesedez, jakinarazi arazoa <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud komunitateari</a>.", "Continue to {productName}" : "Jarraitu hona: {productName}", + "_The update was successful. Redirecting you to {productName} in %n second._::_The update was successful. Redirecting you to {productName} in %n seconds._" : ["Eguneraketa behar bezala egin da. {ProductName} ra birbideratuko zaitugu %nsegundotan.","Eguneraketa behar bezala egin da. {ProductName} ra birbideratuko zaitugu %n segundotan."], "Log in" : "Hasi saioa", "Logging in …" : "Saioa hasten...", "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!", @@ -137,6 +138,7 @@ "Please try again or contact your administrator." : "Saiatu berriro edo jarri harremanetan administratzailearekin.", "Username or email" : "Erabiltzaile-izena edo e-posta", "Password" : "Pasahitza", + "Toggle password visibility" : "Txandakati pasahitzaren ikusgaitasuna", "Wrong username or password." : "Erabiltzaile-izen edo pasahitz okerra.", "User disabled" : "Erabiltzailea desgaituta", "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "Saioa hasteko hainbat saiakera baliogabe jaso ditugu zure IPtik. Ondorioz, zure hurrengo saio hasiera 30 segundo atzeratuko da.", @@ -144,6 +146,7 @@ "Passwordless authentication is not supported in your browser." : "Zure nabigatzaileak ez du pasahitzik gabeko autentifikaziorik onartzen.", "Passwordless authentication is only available over a secure connection." : "Pasahitzik gabeko autentifikazioa konexio seguruetan erabil daiteke soilik.", "Reset password" : "Berrezarri pasahitza", + "A password reset message has been sent to the email address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help." : "Pasahitza berrezartzeko mezu bat bidali da kontu honen helbide elektronikora. Jasotzen ez baduzu, egiaztatu spam/zabor karpetak edo eskatu laguntza administratzaile lokalari.", "If it is not there ask your local administrator." : "Han ez badago, galdetu zure administratzaile lokalari.", "Couldn't send reset email. Please contact your administrator." : "Ezin izan da berrezartzeko e-posta bidali. Jarri zure administratzailearekin harremanetan.", "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Jarri zure administratzailearekin harremanetan.", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index f35aac2c49d..93dbf4d1bcc 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -140,6 +140,7 @@ OC.L10N.register( "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met je beheerder.", "Username or email" : "Gebruikersnaam of email", "Password" : "Wachtwoord", + "Toggle password visibility" : "Omschakelen zichtbaarheid wachtwoord", "Wrong username or password." : "Verkeerde gebruikersnaam of wachtwoord.", "User disabled" : "Gebruiker gedeactiveerd", "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "We hebben meerdere foutieve inlogverzoeken vanaf jouw IP-adres gedetecteerd. Hierdoor wordt je volgende inlogverzoek 30 seconden uitgesteld.", @@ -147,6 +148,7 @@ OC.L10N.register( "Passwordless authentication is not supported in your browser." : "Inloggen zonder wachtwoord is niet ondersteund door je browser.", "Passwordless authentication is only available over a secure connection." : "Inloggen zonder wachtwoord is alleen mogelijk over een beveiligde verbinding.", "Reset password" : "Reset wachtwoord", + "A password reset message has been sent to the email address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help." : "Er is een wachtwoordherstelbericht verzonden naar het e-mailadres van dit account. Als je het niet hebt ontvangen, controleer dan je spam / ongewenste mappen, of vraag je beheerder om hulp.", "If it is not there ask your local administrator." : "Als het hier niet is, vraag dan de lokale beheerder", "Couldn't send reset email. Please contact your administrator." : "Kon herstel email niet versturen. Neem contact op met je beheerder.", "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met je beheerder.", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index aeabe9e711f..59c15c54b3c 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -138,6 +138,7 @@ "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met je beheerder.", "Username or email" : "Gebruikersnaam of email", "Password" : "Wachtwoord", + "Toggle password visibility" : "Omschakelen zichtbaarheid wachtwoord", "Wrong username or password." : "Verkeerde gebruikersnaam of wachtwoord.", "User disabled" : "Gebruiker gedeactiveerd", "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "We hebben meerdere foutieve inlogverzoeken vanaf jouw IP-adres gedetecteerd. Hierdoor wordt je volgende inlogverzoek 30 seconden uitgesteld.", @@ -145,6 +146,7 @@ "Passwordless authentication is not supported in your browser." : "Inloggen zonder wachtwoord is niet ondersteund door je browser.", "Passwordless authentication is only available over a secure connection." : "Inloggen zonder wachtwoord is alleen mogelijk over een beveiligde verbinding.", "Reset password" : "Reset wachtwoord", + "A password reset message has been sent to the email address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help." : "Er is een wachtwoordherstelbericht verzonden naar het e-mailadres van dit account. Als je het niet hebt ontvangen, controleer dan je spam / ongewenste mappen, of vraag je beheerder om hulp.", "If it is not there ask your local administrator." : "Als het hier niet is, vraag dan de lokale beheerder", "Couldn't send reset email. Please contact your administrator." : "Kon herstel email niet versturen. Neem contact op met je beheerder.", "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met je beheerder.", diff --git a/core/l10n/pl.js b/core/l10n/pl.js index 2a5b391f202..3b9557cdc6d 100644 --- a/core/l10n/pl.js +++ b/core/l10n/pl.js @@ -20,7 +20,7 @@ OC.L10N.register( "An error occurred. Please contact your admin." : "Wystąpił błąd. Skontaktuj się z administratorem.", "No temporary profile picture available, try again" : "Brak tymczasowego zdjęcia profilowego, spróbuj ponownie", "No crop data provided" : "Brak danych do przycięcia", - "No valid crop data provided" : "Brak poprawnych danych do przycięcia", + "No valid crop data provided" : "Brak prawidłowych danych do przycięcia", "Crop is not square" : "Przycięcie nie jest kwadratowe", "State token does not match" : "Token nie pasuje", "Invalid app password" : "Nieprawidłowe hasło do aplikacji", diff --git a/core/l10n/pl.json b/core/l10n/pl.json index 1f423b17d5c..778abb73705 100644 --- a/core/l10n/pl.json +++ b/core/l10n/pl.json @@ -18,7 +18,7 @@ "An error occurred. Please contact your admin." : "Wystąpił błąd. Skontaktuj się z administratorem.", "No temporary profile picture available, try again" : "Brak tymczasowego zdjęcia profilowego, spróbuj ponownie", "No crop data provided" : "Brak danych do przycięcia", - "No valid crop data provided" : "Brak poprawnych danych do przycięcia", + "No valid crop data provided" : "Brak prawidłowych danych do przycięcia", "Crop is not square" : "Przycięcie nie jest kwadratowe", "State token does not match" : "Token nie pasuje", "Invalid app password" : "Nieprawidłowe hasło do aplikacji", diff --git a/core/register_command.php b/core/register_command.php index 4d0e0ceb992..c9e86052197 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -163,7 +163,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) { $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess()); $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory())); - $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class))); + $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->query(\OC\Installer::class))); $application->add(new OC\Core\Command\Maintenance\Repair( new \OC\Repair([], \OC::$server->getEventDispatcher(), \OC::$server->get(LoggerInterface::class)), \OC::$server->getConfig(), diff --git a/lib/base.php b/lib/base.php index 9575f396265..b433806ac38 100644 --- a/lib/base.php +++ b/lib/base.php @@ -929,7 +929,7 @@ class OC { \OC::$server->get(\bantu\IniGetWrapper\IniGetWrapper::class), \OC::$server->getL10N('lib'), \OC::$server->query(\OCP\Defaults::class), - \OC::$server->getLogger(), + \OC::$server->get(\Psr\Log\LoggerInterface::class), \OC::$server->getSecureRandom(), \OC::$server->query(\OC\Installer::class) ); diff --git a/lib/l10n/es.js b/lib/l10n/es.js index 76b132ae82a..cbf28b9f781 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -120,7 +120,7 @@ OC.L10N.register( "Files can’t be shared with delete permissions" : "Los archivos no se pueden compartir con permisos de borrado", "Files can’t be shared with create permissions" : "Los archivos no se pueden compartir con permisos de creación", "Expiration date is in the past" : "Ha pasado la fecha de caducidad", - "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["No se puede establecer la fecha de expiración a más de %n día en el futuro","No se puede establecer la fecha de expiración a más de %n días en el futuro"], + "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["No se puede establecer una fecha de caducidad de más de %n día hacia el futuro","No se puede establecer una fecha de caducidad de más de %n días hacia el futuro"], "Sharing is only allowed with group members" : "Sólo está permitido compartir a los integrantes del grupo", "Sharing %s failed, because this item is already shared with user %s" : "No se pudo compartir %s, porque este elemento ya está compartido con el usuario %s", "%1$s shared »%2$s« with you" : "%1$s ha compartido «%2$s» contigo", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index 5805f6da920..61bd04215d5 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -118,7 +118,7 @@ "Files can’t be shared with delete permissions" : "Los archivos no se pueden compartir con permisos de borrado", "Files can’t be shared with create permissions" : "Los archivos no se pueden compartir con permisos de creación", "Expiration date is in the past" : "Ha pasado la fecha de caducidad", - "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["No se puede establecer la fecha de expiración a más de %n día en el futuro","No se puede establecer la fecha de expiración a más de %n días en el futuro"], + "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["No se puede establecer una fecha de caducidad de más de %n día hacia el futuro","No se puede establecer una fecha de caducidad de más de %n días hacia el futuro"], "Sharing is only allowed with group members" : "Sólo está permitido compartir a los integrantes del grupo", "Sharing %s failed, because this item is already shared with user %s" : "No se pudo compartir %s, porque este elemento ya está compartido con el usuario %s", "%1$s shared »%2$s« with you" : "%1$s ha compartido «%2$s» contigo", diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js index 10fc7ad3f81..5d1a87f5b13 100644 --- a/lib/l10n/eu.js +++ b/lib/l10n/eu.js @@ -95,6 +95,7 @@ OC.L10N.register( "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua", "Can’t increase permissions of %s" : "Ezin dira %s(r)en baimenak handitu", "Files can’t be shared with delete permissions" : "Fitxategiak ezin dira ezabatze baimenarekin partekatu", + "Files can’t be shared with create permissions" : "Fitxategiak ezin dira sortze baimenarekin partekatu", "Expiration date is in the past" : "Iraungitze-data iraganean dago", "%1$s shared »%2$s« with you" : "%1$serabiltzaileak »%2$s« partekatu du zurekin", "%1$s shared »%2$s« with you." : "%1$serabiltzaileak »%2$s« partekatu du zurekin", diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json index 99c477199c4..1c2b7cdfc14 100644 --- a/lib/l10n/eu.json +++ b/lib/l10n/eu.json @@ -93,6 +93,7 @@ "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua", "Can’t increase permissions of %s" : "Ezin dira %s(r)en baimenak handitu", "Files can’t be shared with delete permissions" : "Fitxategiak ezin dira ezabatze baimenarekin partekatu", + "Files can’t be shared with create permissions" : "Fitxategiak ezin dira sortze baimenarekin partekatu", "Expiration date is in the past" : "Iraungitze-data iraganean dago", "%1$s shared »%2$s« with you" : "%1$serabiltzaileak »%2$s« partekatu du zurekin", "%1$s shared »%2$s« with you." : "%1$serabiltzaileak »%2$s« partekatu du zurekin", diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js index ff02f04054c..92a6d79fcda 100644 --- a/lib/l10n/pl.js +++ b/lib/l10n/pl.js @@ -95,7 +95,7 @@ OC.L10N.register( "%s enter the database username." : "Podaj nazwę użytkownika dla %s.", "%s enter the database name." : "Podaj nazwę bazy danych dla %s.", "%s you may not use dots in the database name" : "Nie możesz używać kropek w nazwie bazy danych %s.", - "MySQL username and/or password not valid" : "Zła nazwa użytkownika i/lub hasło do bazy danych MySQL", + "MySQL username and/or password not valid" : "Błędna nazwa użytkownika i/lub hasło do bazy danych MySQL", "You need to enter details of an existing account." : "Musisz wprowadzić szczegółowe dane dla istniejącego konta.", "Oracle connection could not be established" : "Nie można nawiązać połączenia z bazą danych Oracle", "Oracle username and/or password not valid" : "Zła nazwa użytkownika i/lub hasło do bazy danych Oracle", @@ -120,7 +120,7 @@ OC.L10N.register( "Files can’t be shared with delete permissions" : "Pliki nie mogą zostać udostępnione z prawem do usuwania", "Files can’t be shared with create permissions" : "Pliki nie mogą zostać udostępnione z prawem do tworzenia", "Expiration date is in the past" : "Data ważności już minęła", - "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["Nie można ustawić daty ważności na dłuższą niż %n dzień ","Nie można ustawić daty ważności na dłuższą niż %n dni","Nie można ustawić daty ważności na dłuższą niż %n dni","Nie można ustawić daty ważności na dłuższą niż %n dni"], + "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["Nie można ustawić daty wygaśnięcia na dłuższą niż %n dzień","Nie można ustawić daty wygaśnięcia na dłuższą niż %n dni","Nie można ustawić daty wygaśnięcia na dłuższą niż %n dni","Nie można ustawić daty wygaśnięcia na dłuższą niż %n dni"], "Sharing is only allowed with group members" : "Udostępnianie jest dozwolone tylko członkom grupy", "Sharing %s failed, because this item is already shared with user %s" : "Udostępnianie %s nie powiodło się, ponieważ element jest już udostępniony użytkownikowi %s", "%1$s shared »%2$s« with you" : "%1$s udostępnił Tobie »%2$s«", @@ -235,6 +235,6 @@ OC.L10N.register( "Following databases are supported: %s" : "Obsługiwane są następujące bazy danych: %s", "Following platforms are supported: %s" : "Obsługiwane są następujące platformy: %s", "Invalid Federated Cloud ID" : "Nieprawidłowy ID Chmury Federacyjnej", - "Can’t set expiration date more than %s days in the future" : "Nie można ustawić daty ważności na dłuższą niż %s dni" + "Can’t set expiration date more than %s days in the future" : "Nie można ustawić daty wygaśnięcia na dłuższą niż %s dni" }, "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"); diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json index b0e13d9f100..bfc6b70c9c3 100644 --- a/lib/l10n/pl.json +++ b/lib/l10n/pl.json @@ -93,7 +93,7 @@ "%s enter the database username." : "Podaj nazwę użytkownika dla %s.", "%s enter the database name." : "Podaj nazwę bazy danych dla %s.", "%s you may not use dots in the database name" : "Nie możesz używać kropek w nazwie bazy danych %s.", - "MySQL username and/or password not valid" : "Zła nazwa użytkownika i/lub hasło do bazy danych MySQL", + "MySQL username and/or password not valid" : "Błędna nazwa użytkownika i/lub hasło do bazy danych MySQL", "You need to enter details of an existing account." : "Musisz wprowadzić szczegółowe dane dla istniejącego konta.", "Oracle connection could not be established" : "Nie można nawiązać połączenia z bazą danych Oracle", "Oracle username and/or password not valid" : "Zła nazwa użytkownika i/lub hasło do bazy danych Oracle", @@ -118,7 +118,7 @@ "Files can’t be shared with delete permissions" : "Pliki nie mogą zostać udostępnione z prawem do usuwania", "Files can’t be shared with create permissions" : "Pliki nie mogą zostać udostępnione z prawem do tworzenia", "Expiration date is in the past" : "Data ważności już minęła", - "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["Nie można ustawić daty ważności na dłuższą niż %n dzień ","Nie można ustawić daty ważności na dłuższą niż %n dni","Nie można ustawić daty ważności na dłuższą niż %n dni","Nie można ustawić daty ważności na dłuższą niż %n dni"], + "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["Nie można ustawić daty wygaśnięcia na dłuższą niż %n dzień","Nie można ustawić daty wygaśnięcia na dłuższą niż %n dni","Nie można ustawić daty wygaśnięcia na dłuższą niż %n dni","Nie można ustawić daty wygaśnięcia na dłuższą niż %n dni"], "Sharing is only allowed with group members" : "Udostępnianie jest dozwolone tylko członkom grupy", "Sharing %s failed, because this item is already shared with user %s" : "Udostępnianie %s nie powiodło się, ponieważ element jest już udostępniony użytkownikowi %s", "%1$s shared »%2$s« with you" : "%1$s udostępnił Tobie »%2$s«", @@ -233,6 +233,6 @@ "Following databases are supported: %s" : "Obsługiwane są następujące bazy danych: %s", "Following platforms are supported: %s" : "Obsługiwane są następujące platformy: %s", "Invalid Federated Cloud ID" : "Nieprawidłowy ID Chmury Federacyjnej", - "Can’t set expiration date more than %s days in the future" : "Nie można ustawić daty ważności na dłuższą niż %s dni" + "Can’t set expiration date more than %s days in the future" : "Nie można ustawić daty wygaśnięcia na dłuższą niż %s dni" },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" }
\ No newline at end of file diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js index 4e97c1218c8..77cc9bb2da7 100644 --- a/lib/l10n/pt_BR.js +++ b/lib/l10n/pt_BR.js @@ -120,6 +120,7 @@ OC.L10N.register( "Files can’t be shared with delete permissions" : "Os arquivos não podem ser compartilhados com permissões de exclusão", "Files can’t be shared with create permissions" : "Os arquivos não podem ser compartilhados com permissões de criação", "Expiration date is in the past" : "Data de expiração está no passado", + "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["Não é possível definir uma data de validade superior a 1%n dia no futuro","Não é possível definir uma data de validade superior a %n dias no futuro"], "Sharing is only allowed with group members" : "O compartilhamento só é permitido com membros do grupo ", "Sharing %s failed, because this item is already shared with user %s" : "Compartilhamento %s falhou, porque este item já está compartilhado com o usuário %s", "%1$s shared »%2$s« with you" : "%1$s compartilhou »%2$s« com você", diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json index 4d1abf4bf9c..e106225713c 100644 --- a/lib/l10n/pt_BR.json +++ b/lib/l10n/pt_BR.json @@ -118,6 +118,7 @@ "Files can’t be shared with delete permissions" : "Os arquivos não podem ser compartilhados com permissões de exclusão", "Files can’t be shared with create permissions" : "Os arquivos não podem ser compartilhados com permissões de criação", "Expiration date is in the past" : "Data de expiração está no passado", + "_Can’t set expiration date more than %n day in the future_::_Can’t set expiration date more than %n days in the future_" : ["Não é possível definir uma data de validade superior a 1%n dia no futuro","Não é possível definir uma data de validade superior a %n dias no futuro"], "Sharing is only allowed with group members" : "O compartilhamento só é permitido com membros do grupo ", "Sharing %s failed, because this item is already shared with user %s" : "Compartilhamento %s falhou, porque este item já está compartilhado com o usuário %s", "%1$s shared »%2$s« with you" : "%1$s compartilhou »%2$s« com você", diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php index d5df6557c8f..53792c70d27 100644 --- a/lib/private/Accounts/AccountManager.php +++ b/lib/private/Accounts/AccountManager.php @@ -121,6 +121,25 @@ class AccountManager implements IAccountManager { } /** + * + * @param string $input + * @return string + * @throws \InvalidArgumentException When the website did not have http(s) as protocol or the host name was empty + */ + protected function parseWebsite(string $input): string { + $parts = parse_url($input); + if (!isset($parts['scheme']) || ($parts['scheme'] !== 'https' && $parts['scheme'] !== 'http')) { + throw new \InvalidArgumentException(self::PROPERTY_WEBSITE); + } + + if (!isset($parts['host']) || $parts['host'] === '') { + throw new \InvalidArgumentException(self::PROPERTY_WEBSITE); + } + + return $input; + } + + /** * update user record * * @param IUser $user @@ -158,6 +177,17 @@ class AccountManager implements IAccountManager { } } + if (isset($data[self::PROPERTY_WEBSITE]) && $data[self::PROPERTY_WEBSITE]['value'] !== '') { + try { + $data[self::PROPERTY_WEBSITE]['value'] = $this->parseWebsite($data[self::PROPERTY_WEBSITE]['value']); + } catch (\InvalidArgumentException $e) { + if ($throwOnData) { + throw $e; + } + $data[self::PROPERTY_WEBSITE]['value'] = ''; + } + } + $allowedScopes = [ self::SCOPE_PRIVATE, self::SCOPE_LOCAL, diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 7063878429a..a00a93aa847 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -46,9 +46,9 @@ use OCP\ICacheFactory; use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; -use OCP\ILogger; use OCP\IUser; use OCP\IUserSession; +use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class AppManager implements IAppManager { @@ -83,7 +83,7 @@ class AppManager implements IAppManager { /** @var EventDispatcherInterface */ private $dispatcher; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var string[] $appId => $enabled */ @@ -104,21 +104,13 @@ class AppManager implements IAppManager { /** @var array */ private $autoDisabledApps = []; - /** - * @param IUserSession $userSession - * @param IConfig $config - * @param AppConfig $appConfig - * @param IGroupManager $groupManager - * @param ICacheFactory $memCacheFactory - * @param EventDispatcherInterface $dispatcher - */ public function __construct(IUserSession $userSession, IConfig $config, AppConfig $appConfig, IGroupManager $groupManager, ICacheFactory $memCacheFactory, EventDispatcherInterface $dispatcher, - ILogger $logger) { + LoggerInterface $logger) { $this->userSession = $userSession; $this->config = $config; $this->appConfig = $appConfig; @@ -249,7 +241,7 @@ class AppManager implements IAppManager { if (!is_array($groupIds)) { $jsonError = json_last_error(); - $this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']); + $this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError); return false; } @@ -282,7 +274,7 @@ class AppManager implements IAppManager { if (!is_array($groupIds)) { $jsonError = json_last_error(); - $this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']); + $this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError); return false; } diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 416e55463cf..7ed02fdf010 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -36,7 +36,7 @@ use OC\Files\AppData\Factory; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Http\Client\IClientService; use OCP\IConfig; -use OCP\ILogger; +use Psr\Log\LoggerInterface; class AppFetcher extends Fetcher { @@ -46,20 +46,12 @@ class AppFetcher extends Fetcher { /** @var bool */ private $ignoreMaxVersion; - /** - * @param Factory $appDataFactory - * @param IClientService $clientService - * @param ITimeFactory $timeFactory - * @param IConfig $config - * @param CompareVersion $compareVersion - * @param ILogger $logger - */ public function __construct(Factory $appDataFactory, IClientService $clientService, ITimeFactory $timeFactory, IConfig $config, CompareVersion $compareVersion, - ILogger $logger) { + LoggerInterface $logger) { parent::__construct( $appDataFactory, $clientService, @@ -86,7 +78,7 @@ class AppFetcher extends Fetcher { protected function fetch($ETag, $content, $allowUnstable = false) { /** @var mixed[] $response */ $response = parent::fetch($ETag, $content); - + if (empty($response)) { return []; } @@ -134,7 +126,9 @@ class AppFetcher extends Fetcher { $releases[] = $release; } } catch (\InvalidArgumentException $e) { - $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]); + $this->logger->warning($e->getMessage(), [ + 'exception' => $e, + ]); } } } diff --git a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php index e34fbee8c58..896444a6640 100644 --- a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php +++ b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php @@ -31,21 +31,14 @@ use OC\Files\AppData\Factory; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Http\Client\IClientService; use OCP\IConfig; -use OCP\ILogger; +use Psr\Log\LoggerInterface; class CategoryFetcher extends Fetcher { - /** - * @param Factory $appDataFactory - * @param IClientService $clientService - * @param ITimeFactory $timeFactory - * @param IConfig $config - * @param ILogger $logger - */ public function __construct(Factory $appDataFactory, IClientService $clientService, ITimeFactory $timeFactory, IConfig $config, - ILogger $logger) { + LoggerInterface $logger) { parent::__construct( $appDataFactory, $clientService, diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index c5d83fcb1df..24c2fce00f5 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -39,7 +39,7 @@ use OCP\Files\IAppData; use OCP\Files\NotFoundException; use OCP\Http\Client\IClientService; use OCP\IConfig; -use OCP\ILogger; +use Psr\Log\LoggerInterface; abstract class Fetcher { public const INVALIDATE_AFTER_SECONDS = 3600; @@ -53,7 +53,7 @@ abstract class Fetcher { protected $timeFactory; /** @var IConfig */ protected $config; - /** @var Ilogger */ + /** @var LoggerInterface */ protected $logger; /** @var string */ protected $fileName; @@ -64,18 +64,11 @@ abstract class Fetcher { /** @var string */ protected $channel; - /** - * @param Factory $appDataFactory - * @param IClientService $clientService - * @param ITimeFactory $timeFactory - * @param IConfig $config - * @param ILogger $logger - */ public function __construct(Factory $appDataFactory, IClientService $clientService, ITimeFactory $timeFactory, IConfig $config, - ILogger $logger) { + LoggerInterface $logger) { $this->appData = $appDataFactory->get('appstore'); $this->clientService = $clientService; $this->timeFactory = $timeFactory; @@ -202,7 +195,10 @@ abstract class Fetcher { $this->logger->warning('Could not connect to appstore: ' . $e->getMessage(), ['app' => 'appstoreFetcher']); return []; } catch (\Exception $e) { - $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]); + $this->logger->warning($e->getMessage(), [ + 'exception' => $e, + 'app' => 'appstoreFetcher', + ]); return []; } } diff --git a/lib/private/AppFramework/Bootstrap/Coordinator.php b/lib/private/AppFramework/Bootstrap/Coordinator.php index 06a17e5242b..33b02c0291f 100644 --- a/lib/private/AppFramework/Bootstrap/Coordinator.php +++ b/lib/private/AppFramework/Bootstrap/Coordinator.php @@ -36,8 +36,8 @@ use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\QueryException; use OCP\Dashboard\IManager; use OCP\EventDispatcher\IEventDispatcher; -use OCP\ILogger; use OCP\IServerContainer; +use Psr\Log\LoggerInterface; use Throwable; use function class_exists; use function class_implements; @@ -57,7 +57,7 @@ class Coordinator { /** @var IEventDispatcher */ private $eventDispatcher; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var RegistrationContext|null */ @@ -70,7 +70,7 @@ class Coordinator { Registry $registry, IManager $dashboardManager, IEventDispatcher $eventListener, - ILogger $logger) { + LoggerInterface $logger) { $this->serverContainer = $container; $this->registry = $registry; $this->dashboardManager = $dashboardManager; @@ -124,9 +124,8 @@ class Coordinator { try { $application->register($this->registrationContext->for($appId)); } catch (Throwable $e) { - $this->logger->logException($e, [ - 'message' => 'Error during app service registration: ' . $e->getMessage(), - 'level' => ILogger::FATAL, + $this->logger->emergency('Error during app service registration: ' . $e->getMessage(), [ + 'exception' => $e, ]); } } @@ -176,13 +175,12 @@ class Coordinator { $application->boot($context); } } catch (QueryException $e) { - $this->logger->logException($e, [ - 'message' => "Could not boot $appId" . $e->getMessage(), + $this->logger->error("Could not boot $appId" . $e->getMessage(), [ + 'exception' => $e, ]); } catch (Throwable $e) { - $this->logger->logException($e, [ - 'message' => "Could not boot $appId" . $e->getMessage(), - 'level' => ILogger::FATAL, + $this->logger->emergency("Could not boot $appId" . $e->getMessage(), [ + 'exception' => $e, ]); } } diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php index d056c088a9f..0859e606b7e 100644 --- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php +++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php @@ -43,10 +43,10 @@ use OCP\Dashboard\IWidget; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Template\ICustomTemplateProvider; use OCP\Http\WellKnown\IHandler; -use OCP\ILogger; use OCP\Notification\INotifier; use OCP\Search\IProvider; use OCP\Support\CrashReport\IReporter; +use Psr\Log\LoggerInterface; use Throwable; use function array_shift; @@ -97,10 +97,10 @@ class RegistrationContext { /** @var ServiceRegistration<\OCP\Authentication\TwoFactorAuth\IProvider>[] */ private $twoFactorProviders = []; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; - public function __construct(ILogger $logger) { + public function __construct(LoggerInterface $logger) { $this->logger = $logger; } @@ -313,9 +313,8 @@ class RegistrationContext { ->registerCapability($registration->getService()); } catch (Throwable $e) { $appId = $registration->getAppId(); - $this->logger->logException($e, [ - 'message' => "Error during capability registration of $appId: " . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error("Error during capability registration of $appId: " . $e->getMessage(), [ + 'exception' => $e, ]); } } @@ -330,9 +329,8 @@ class RegistrationContext { $registry->registerLazy($registration->getService()); } catch (Throwable $e) { $appId = $registration->getAppId(); - $this->logger->logException($e, [ - 'message' => "Error during crash reporter registration of $appId: " . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error("Error during crash reporter registration of $appId: " . $e->getMessage(), [ + 'exception' => $e, ]); } } @@ -347,9 +345,8 @@ class RegistrationContext { $dashboardManager->lazyRegisterWidget($panel->getService()); } catch (Throwable $e) { $appId = $panel->getAppId(); - $this->logger->logException($e, [ - 'message' => "Error during dashboard registration of $appId: " . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error("Error during dashboard registration of $appId: " . $e->getMessage(), [ + 'exception' => $e, ]); } } @@ -365,9 +362,8 @@ class RegistrationContext { ); } catch (Throwable $e) { $appId = $registration->getAppId(); - $this->logger->logException($e, [ - 'message' => "Error during event listener registration of $appId: " . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error("Error during event listener registration of $appId: " . $e->getMessage(), [ + 'exception' => $e, ]); } } @@ -391,9 +387,8 @@ class RegistrationContext { ); } catch (Throwable $e) { $appId = $registration->getAppId(); - $this->logger->logException($e, [ - 'message' => "Error during service registration of $appId: " . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error("Error during service registration of $appId: " . $e->getMessage(), [ + 'exception' => $e, ]); } } @@ -408,9 +403,8 @@ class RegistrationContext { ); } catch (Throwable $e) { $appId = $registration->getAppId(); - $this->logger->logException($e, [ - 'message' => "Error during service alias registration of $appId: " . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error("Error during service alias registration of $appId: " . $e->getMessage(), [ + 'exception' => $e, ]); } } @@ -425,9 +419,8 @@ class RegistrationContext { ); } catch (Throwable $e) { $appId = $registration->getAppId(); - $this->logger->logException($e, [ - 'message' => "Error during service alias registration of $appId: " . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error("Error during service alias registration of $appId: " . $e->getMessage(), [ + 'exception' => $e, ]); } } @@ -444,9 +437,8 @@ class RegistrationContext { ->registerMiddleWare($middleware->getService()); } catch (Throwable $e) { $appId = $middleware->getAppId(); - $this->logger->logException($e, [ - 'message' => "Error during capability registration of $appId: " . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error("Error during capability registration of $appId: " . $e->getMessage(), [ + 'exception' => $e, ]); } } diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 7395be703d3..db4f3d2c075 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -241,7 +241,7 @@ class DIContainer extends SimpleContainer implements IAppContainer { $c->get(IControllerMethodReflector::class), $c->get(INavigationManager::class), $c->get(IURLGenerator::class), - $server->query(ILogger::class), + $server->get(LoggerInterface::class), $c->get('AppName'), $server->getUserSession()->isLoggedIn(), $this->getUserId() !== null && $server->getGroupManager()->isAdmin($this->getUserId()), diff --git a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php index 712becb3be5..f5960880546 100644 --- a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php @@ -27,7 +27,7 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Utility\ControllerMethodReflector; use OC\Security\RateLimiting\Exception\RateLimitExceededException; use OC\Security\RateLimiting\Limiter; -use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Middleware; use OCP\IRequest; @@ -110,21 +110,14 @@ class RateLimitingMiddleware extends Middleware { public function afterException($controller, $methodName, \Exception $exception) { if ($exception instanceof RateLimitExceededException) { if (stripos($this->request->getHeader('Accept'),'html') === false) { - $response = new JSONResponse( - [ - 'message' => $exception->getMessage(), - ], - $exception->getCode() - ); + $response = new DataResponse([], $exception->getCode()); } else { $response = new TemplateResponse( - 'core', - '403', - [ - 'file' => $exception->getMessage() - ], - 'guest' - ); + 'core', + '429', + [], + TemplateResponse::RENDER_AS_GUEST + ); $response->setStatus($exception->getCode()); } diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index 76665f8998f..9fa696154ff 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -55,11 +55,11 @@ use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Middleware; use OCP\AppFramework\OCSController; use OCP\IL10N; -use OCP\ILogger; use OCP\INavigationManager; use OCP\IRequest; use OCP\IURLGenerator; use OCP\Util; +use Psr\Log\LoggerInterface; /** * Used to do all the authentication and checking stuff for a controller method @@ -78,7 +78,7 @@ class SecurityMiddleware extends Middleware { private $appName; /** @var IURLGenerator */ private $urlGenerator; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var bool */ private $isLoggedIn; @@ -95,7 +95,7 @@ class SecurityMiddleware extends Middleware { ControllerMethodReflector $reflector, INavigationManager $navigationManager, IURLGenerator $urlGenerator, - ILogger $logger, + LoggerInterface $logger, string $appName, bool $isLoggedIn, bool $isAdminUser, @@ -233,9 +233,8 @@ class SecurityMiddleware extends Middleware { } } - $this->logger->logException($exception, [ - 'level' => ILogger::DEBUG, - 'app' => 'core', + $this->logger->debug($exception->getMessage(), [ + 'exception' => $exception, ]); return $response; } diff --git a/lib/private/Avatar/Avatar.php b/lib/private/Avatar/Avatar.php index f716c567c79..bd40766afcb 100644 --- a/lib/private/Avatar/Avatar.php +++ b/lib/private/Avatar/Avatar.php @@ -43,14 +43,14 @@ use OC\Color; use OC_Image; use OCP\Files\NotFoundException; use OCP\IAvatar; -use OCP\ILogger; +use Psr\Log\LoggerInterface; /** * This class gets and sets users avatars. */ abstract class Avatar implements IAvatar { - /** @var ILogger */ + /** @var LoggerInterface */ protected $logger; /** @@ -69,12 +69,7 @@ abstract class Avatar implements IAvatar { <text x="50%" y="350" style="font-weight:normal;font-size:280px;font-family:\'Noto Sans\';text-anchor:middle;fill:#fff">{letter}</text> </svg>'; - /** - * The base avatar constructor. - * - * @param ILogger $logger The logger - */ - public function __construct(ILogger $logger) { + public function __construct(LoggerInterface $logger) { $this->logger = $logger; } diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php index 04d3a721022..c54539b2cde 100644 --- a/lib/private/Avatar/AvatarManager.php +++ b/lib/private/Avatar/AvatarManager.php @@ -45,8 +45,8 @@ use OCP\IAvatar; use OCP\IAvatarManager; use OCP\IConfig; use OCP\IL10N; -use OCP\ILogger; use OCP\IUserSession; +use Psr\Log\LoggerInterface; /** * This class implements methods to access Avatar functionality @@ -65,7 +65,7 @@ class AvatarManager implements IAvatarManager { /** @var IL10N */ private $l; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var IConfig */ @@ -77,22 +77,12 @@ class AvatarManager implements IAvatarManager { /** @var KnownUserService */ private $knownUserService; - /** - * AvatarManager constructor. - * - * @param Manager $userManager - * @param IAppData $appData - * @param IL10N $l - * @param ILogger $logger - * @param IConfig $config - * @param IUserSession $userSession - */ public function __construct( IUserSession $userSession, Manager $userManager, IAppData $appData, IL10N $l, - ILogger $logger, + LoggerInterface $logger, IConfig $config, IAccountManager $accountManager, KnownUserService $knownUserService diff --git a/lib/private/Avatar/GuestAvatar.php b/lib/private/Avatar/GuestAvatar.php index cc7e21b9fe6..c208353d726 100644 --- a/lib/private/Avatar/GuestAvatar.php +++ b/lib/private/Avatar/GuestAvatar.php @@ -27,7 +27,7 @@ declare(strict_types=1); namespace OC\Avatar; use OCP\Files\SimpleFS\InMemoryFile; -use OCP\ILogger; +use Psr\Log\LoggerInterface; /** * This class represents a guest user's avatar. @@ -44,9 +44,9 @@ class GuestAvatar extends Avatar { * GuestAvatar constructor. * * @param string $userDisplayName The guest user display name - * @param ILogger $logger The logger + * @param LoggerInterface $logger The logger */ - public function __construct(string $userDisplayName, ILogger $logger) { + public function __construct(string $userDisplayName, LoggerInterface $logger) { parent::__construct($logger); $this->userDisplayName = $userDisplayName; } diff --git a/lib/private/Avatar/PlaceholderAvatar.php b/lib/private/Avatar/PlaceholderAvatar.php index 5883fe531a3..377b5e03654 100644 --- a/lib/private/Avatar/PlaceholderAvatar.php +++ b/lib/private/Avatar/PlaceholderAvatar.php @@ -38,7 +38,7 @@ use OCP\Files\SimpleFS\ISimpleFolder; use OCP\IConfig; use OCP\IImage; use OCP\IL10N; -use OCP\ILogger; +use Psr\Log\LoggerInterface; /** * This class represents a registered user's placeholder avatar. @@ -60,12 +60,12 @@ class PlaceholderAvatar extends Avatar { * @param ISimpleFolder $folder The avatar files folder * @param IL10N $l The localization helper * @param User $user The user this class manages the avatar for - * @param ILogger $logger The logger + * @param LoggerInterface $logger The logger */ public function __construct( ISimpleFolder $folder, $user, - ILogger $logger) { + LoggerInterface $logger) { parent::__construct($logger); $this->folder = $folder; diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php index f47809425ed..970548f8c8e 100644 --- a/lib/private/Avatar/UserAvatar.php +++ b/lib/private/Avatar/UserAvatar.php @@ -39,7 +39,7 @@ use OCP\Files\SimpleFS\ISimpleFolder; use OCP\IConfig; use OCP\IImage; use OCP\IL10N; -use OCP\ILogger; +use Psr\Log\LoggerInterface; /** * This class represents a registered user's avatar. @@ -64,13 +64,13 @@ class UserAvatar extends Avatar { * @param ISimpleFolder $folder The avatar files folder * @param IL10N $l The localization helper * @param User $user The user this class manages the avatar for - * @param ILogger $logger The logger + * @param LoggerInterface $logger The logger */ public function __construct( ISimpleFolder $folder, IL10N $l, $user, - ILogger $logger, + LoggerInterface $logger, IConfig $config) { parent::__construct($logger); $this->folder = $folder; diff --git a/lib/private/CapabilitiesManager.php b/lib/private/CapabilitiesManager.php index 6a4d97ad159..efa1cff5146 100644 --- a/lib/private/CapabilitiesManager.php +++ b/lib/private/CapabilitiesManager.php @@ -32,17 +32,17 @@ namespace OC; use OCP\AppFramework\QueryException; use OCP\Capabilities\ICapability; use OCP\Capabilities\IPublicCapability; -use OCP\ILogger; +use Psr\Log\LoggerInterface; class CapabilitiesManager { /** @var \Closure[] */ private $capabilities = []; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; - public function __construct(ILogger $logger) { + public function __construct(LoggerInterface $logger) { $this->logger = $logger; } @@ -59,10 +59,8 @@ class CapabilitiesManager { try { $c = $capability(); } catch (QueryException $e) { - $this->logger->logException($e, [ - 'message' => 'CapabilitiesManager', - 'level' => ILogger::ERROR, - 'app' => 'core', + $this->logger->error('CapabilitiesManager', [ + 'exception' => $e, ]); continue; } diff --git a/lib/private/Collaboration/Collaborators/LookupPlugin.php b/lib/private/Collaboration/Collaborators/LookupPlugin.php index f675cece99e..3d118989cc6 100644 --- a/lib/private/Collaboration/Collaborators/LookupPlugin.php +++ b/lib/private/Collaboration/Collaborators/LookupPlugin.php @@ -33,9 +33,9 @@ use OCP\Collaboration\Collaborators\SearchResultType; use OCP\Federation\ICloudIdManager; use OCP\Http\Client\IClientService; use OCP\IConfig; -use OCP\ILogger; use OCP\IUserSession; use OCP\Share\IShare; +use Psr\Log\LoggerInterface; class LookupPlugin implements ISearchPlugin { @@ -47,14 +47,14 @@ class LookupPlugin implements ISearchPlugin { private $currentUserRemote; /** @var ICloudIdManager */ private $cloudIdManager; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; public function __construct(IConfig $config, IClientService $clientService, IUserSession $userSession, ICloudIdManager $cloudIdManager, - ILogger $logger) { + LoggerInterface $logger) { $this->config = $config; $this->clientService = $clientService; $this->cloudIdManager = $cloudIdManager; @@ -96,8 +96,9 @@ class LookupPlugin implements ISearchPlugin { try { $remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote(); } catch (\Exception $e) { - $this->logger->error('Can not parse federated cloud ID "' . $lookup['federationId'] . '"'); - $this->logger->error($e->getMessage()); + $this->logger->error('Can not parse federated cloud ID "' . $lookup['federationId'] . '"', [ + 'exception' => $e, + ]); continue; } if ($this->currentUserRemote === $remote) { diff --git a/lib/private/Collaboration/Resources/Manager.php b/lib/private/Collaboration/Resources/Manager.php index 97213c45669..a84ca4da241 100644 --- a/lib/private/Collaboration/Resources/Manager.php +++ b/lib/private/Collaboration/Resources/Manager.php @@ -38,8 +38,8 @@ use OCP\Collaboration\Resources\IResource; use OCP\Collaboration\Resources\ResourceException; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; -use OCP\ILogger; use OCP\IUser; +use Psr\Log\LoggerInterface; class Manager implements IManager { public const TABLE_COLLECTIONS = 'collres_collections'; @@ -50,14 +50,14 @@ class Manager implements IManager { protected $connection; /** @var IProviderManager */ protected $providerManager; - /** @var ILogger */ + /** @var LoggerInterface */ protected $logger; /** @var string[] */ protected $providers = []; - public function __construct(IDBConnection $connection, IProviderManager $providerManager, ILogger $logger) { + public function __construct(IDBConnection $connection, IProviderManager $providerManager, LoggerInterface $logger) { $this->connection = $connection; $this->providerManager = $providerManager; $this->logger = $logger; diff --git a/lib/private/Collaboration/Resources/ProviderManager.php b/lib/private/Collaboration/Resources/ProviderManager.php index 095ffdcd8ee..71e7d8b7e2e 100644 --- a/lib/private/Collaboration/Resources/ProviderManager.php +++ b/lib/private/Collaboration/Resources/ProviderManager.php @@ -29,8 +29,8 @@ namespace OC\Collaboration\Resources; use OCP\AppFramework\QueryException; use OCP\Collaboration\Resources\IProvider; use OCP\Collaboration\Resources\IProviderManager; -use OCP\ILogger; use OCP\IServerContainer; +use Psr\Log\LoggerInterface; class ProviderManager implements IProviderManager { @@ -43,10 +43,10 @@ class ProviderManager implements IProviderManager { /** @var IServerContainer */ protected $serverContainer; - /** @var ILogger */ + /** @var LoggerInterface */ protected $logger; - public function __construct(IServerContainer $serverContainer, ILogger $logger) { + public function __construct(IServerContainer $serverContainer, LoggerInterface $logger) { $this->serverContainer = $serverContainer; $this->logger = $logger; } @@ -57,8 +57,8 @@ class ProviderManager implements IProviderManager { try { $this->providerInstances[] = $this->serverContainer->query($provider); } catch (QueryException $e) { - $this->logger->logException($e, [ - 'message' => "Could not query resource provider $provider: " . $e->getMessage() + $this->logger->error("Could not query resource provider $provider: " . $e->getMessage(), [ + 'exception' => $e, ]); } } diff --git a/lib/private/Console/Application.php b/lib/private/Console/Application.php index 9b1cc57aed3..06edf62147e 100644 --- a/lib/private/Console/Application.php +++ b/lib/private/Console/Application.php @@ -37,8 +37,8 @@ use OC_App; use OCP\AppFramework\QueryException; use OCP\Console\ConsoleEvent; use OCP\IConfig; -use OCP\ILogger; use OCP\IRequest; +use Psr\Log\LoggerInterface; use Symfony\Component\Console\Application as SymfonyApplication; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -53,22 +53,15 @@ class Application { private $dispatcher; /** @var IRequest */ private $request; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var MemoryInfo */ private $memoryInfo; - /** - * @param IConfig $config - * @param EventDispatcherInterface $dispatcher - * @param IRequest $request - * @param ILogger $logger - * @param MemoryInfo $memoryInfo - */ public function __construct(IConfig $config, EventDispatcherInterface $dispatcher, IRequest $request, - ILogger $logger, + LoggerInterface $logger, MemoryInfo $memoryInfo) { $defaults = \OC::$server->getThemingDefaults(); $this->config = $config; @@ -142,7 +135,9 @@ class Application { try { require $file; } catch (\Exception $e) { - $this->logger->logException($e); + $this->logger->error($e->getMessage(), [ + 'exception' => $e, + ]); } } } diff --git a/lib/private/InitialStateService.php b/lib/private/InitialStateService.php index bbc893269f7..38de49b4780 100644 --- a/lib/private/InitialStateService.php +++ b/lib/private/InitialStateService.php @@ -33,12 +33,12 @@ use OC\AppFramework\Bootstrap\Coordinator; use OCP\AppFramework\QueryException; use OCP\AppFramework\Services\InitialStateProvider; use OCP\IInitialStateService; -use OCP\ILogger; use OCP\IServerContainer; +use Psr\Log\LoggerInterface; class InitialStateService implements IInitialStateService { - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var string[][] */ @@ -53,7 +53,7 @@ class InitialStateService implements IInitialStateService { /** @var IServerContainer */ private $container; - public function __construct(ILogger $logger, Coordinator $bootstrapCoordinator, IServerContainer $container) { + public function __construct(LoggerInterface $logger, Coordinator $bootstrapCoordinator, IServerContainer $container) { $this->logger = $logger; $this->bootstrapCoordinator = $bootstrapCoordinator; $this->container = $container; @@ -118,9 +118,8 @@ class InitialStateService implements IInitialStateService { $provider = $this->container->query($initialState->getService()); } catch (QueryException $e) { // Log an continue. We can be fault tolerant here. - $this->logger->logException($e, [ - 'message' => 'Could not load initial state provider dynamically: ' . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error('Could not load initial state provider dynamically: ' . $e->getMessage(), [ + 'exception' => $e, 'app' => $initialState->getAppId(), ]); continue; diff --git a/lib/private/Installer.php b/lib/private/Installer.php index fdf9af7446b..432f5c526ad 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -54,6 +54,7 @@ use OCP\IConfig; use OCP\ILogger; use OCP\ITempManager; use phpseclib\File\X509; +use Psr\Log\LoggerInterface; /** * This class provides the functionality needed to install, update and remove apps @@ -65,7 +66,7 @@ class Installer { private $clientService; /** @var ITempManager */ private $tempManager; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; /** @var IConfig */ private $config; @@ -76,18 +77,11 @@ class Installer { /** @var bool */ private $isCLI; - /** - * @param AppFetcher $appFetcher - * @param IClientService $clientService - * @param ITempManager $tempManager - * @param ILogger $logger - * @param IConfig $config - */ public function __construct( AppFetcher $appFetcher, IClientService $clientService, ITempManager $tempManager, - ILogger $logger, + LoggerInterface $logger, IConfig $config, bool $isCLI ) { @@ -201,9 +195,8 @@ class Installer { try { $this->downloadApp($appId, $allowUnstable); } catch (\Exception $e) { - $this->logger->logException($e, [ - 'level' => ILogger::ERROR, - 'app' => 'core', + $this->logger->error($e->getMessage(), [ + 'exception' => $e, ]); return false; } @@ -307,7 +300,10 @@ class Installer { // Check if the signature actually matches the downloaded content $certificate = openssl_get_publickey($app['certificate']); $verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512); - openssl_free_key($certificate); + // PHP 8+ deprecates openssl_free_key and automatically destroys the key instance when it goes out of scope + if ((PHP_VERSION_ID < 80000)) { + openssl_free_key($certificate); + } if ($verified === true) { // Seems to match, let's proceed @@ -339,9 +335,13 @@ class Installer { } // Check if appinfo/info.xml has the same app ID as well - $loadEntities = libxml_disable_entity_loader(false); - $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); - libxml_disable_entity_loader($loadEntities); + if ((PHP_VERSION_ID < 80000)) { + $loadEntities = libxml_disable_entity_loader(false); + $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); + libxml_disable_entity_loader($loadEntities); + } else { + $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); + } if ((string)$xml->id !== $appId) { throw new \Exception( sprintf( diff --git a/lib/private/Log/ErrorHandler.php b/lib/private/Log/ErrorHandler.php index 3f4c9ee64b1..c293c5db83d 100644 --- a/lib/private/Log/ErrorHandler.php +++ b/lib/private/Log/ErrorHandler.php @@ -90,13 +90,30 @@ class ErrorHandler { } $msg = $message . ' at ' . $file . '#' . $line; $e = new \Error(self::removePassword($msg)); - self::$logger->logException($e, ['app' => 'PHP']); + self::$logger->logException($e, ['app' => 'PHP', 'level' => self::errnoToLogLevel($number)]); } //Recoverable handler which catch all errors, warnings and notices public static function onAll($number, $message, $file, $line) { $msg = $message . ' at ' . $file . '#' . $line; $e = new \Error(self::removePassword($msg)); - self::$logger->logException($e, ['app' => 'PHP', 'level' => 0]); + self::$logger->logException($e, ['app' => 'PHP', 'level' => self::errnoToLogLevel($number)]); + } + + public static function errnoToLogLevel(int $errno): int { + switch ($errno) { + case E_USER_WARNING: + return ILogger::WARN; + + case E_USER_DEPRECATED: + return ILogger::DEBUG; + + case E_USER_NOTICE: + return ILogger::INFO; + + case E_USER_ERROR: + default: + return ILogger::ERROR; + } } } diff --git a/lib/private/Server.php b/lib/private/Server.php index c09ec0a8e18..f7eaf9f3591 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -145,6 +145,7 @@ use OC\Template\JSCombiner; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; use OCA\Theming\Util; +use OCA\WorkflowEngine\Service\Logger; use OCP\Accounts\IAccountManager; use OCP\App\IAppManager; use OCP\Authentication\LoginCredentials\IStore; @@ -731,7 +732,7 @@ class Server extends ServerContainer implements IServerContainer { $c->get(\OC\User\Manager::class), $c->getAppDataDir('avatar'), $c->getL10N('lib'), - $c->get(ILogger::class), + $c->get(LoggerInterface::class), $c->get(\OCP\IConfig::class), $c->get(IAccountManager::class), $c->get(KnownUserService::class) @@ -877,7 +878,7 @@ class Server extends ServerContainer implements IServerContainer { $c->get(IGroupManager::class), $c->get(ICacheFactory::class), $c->get(SymfonyAdapter::class), - $c->get(ILogger::class) + $c->get(LoggerInterface::class) ); }); /** @deprecated 19.0.0 */ @@ -1091,7 +1092,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class); $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) { - $manager = new CapabilitiesManager($c->get(ILogger::class)); + $manager = new CapabilitiesManager($c->get(LoggerInterface::class)); $manager->registerCapability(function () use ($c) { return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class)); }); @@ -1334,7 +1335,7 @@ class Server extends ServerContainer implements IServerContainer { $c->get(AppFetcher::class), $c->get(IClientService::class), $c->get(ITempManager::class), - $c->get(ILogger::class), + $c->get(LoggerInterface::class), $c->get(\OCP\IConfig::class), \OC::$CLI ); diff --git a/lib/private/Setup.php b/lib/private/Setup.php index 98cf11e3a87..fe658b2eedd 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -60,8 +60,8 @@ use OCP\AppFramework\Utility\ITimeFactory; use OCP\Defaults; use OCP\IGroup; use OCP\IL10N; -use OCP\ILogger; use OCP\Security\ISecureRandom; +use Psr\Log\LoggerInterface; class Setup { /** @var SystemConfig */ @@ -72,28 +72,19 @@ class Setup { protected $l10n; /** @var Defaults */ protected $defaults; - /** @var ILogger */ + /** @var LoggerInterface */ protected $logger; /** @var ISecureRandom */ protected $random; /** @var Installer */ protected $installer; - /** - * @param SystemConfig $config - * @param IniGetWrapper $iniWrapper - * @param IL10N $l10n - * @param Defaults $defaults - * @param ILogger $logger - * @param ISecureRandom $random - * @param Installer $installer - */ public function __construct( SystemConfig $config, IniGetWrapper $iniWrapper, IL10N $l10n, Defaults $defaults, - ILogger $logger, + LoggerInterface $logger, ISecureRandom $random, Installer $installer ) { @@ -511,7 +502,7 @@ class Setup { \OC::$server->get(IniGetWrapper::class), \OC::$server->getL10N('lib'), \OC::$server->query(Defaults::class), - \OC::$server->getLogger(), + \OC::$server->get(LoggerInterface::class), \OC::$server->getSecureRandom(), \OC::$server->query(Installer::class) ); diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 77f3c02f9f6..5b975bcfcca 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -34,8 +34,8 @@ use OC\DB\ConnectionFactory; use OC\DB\MigrationService; use OC\SystemConfig; use OCP\IL10N; -use OCP\ILogger; use OCP\Security\ISecureRandom; +use Psr\Log\LoggerInterface; abstract class AbstractDatabase { @@ -55,12 +55,12 @@ abstract class AbstractDatabase { protected $tablePrefix; /** @var SystemConfig */ protected $config; - /** @var ILogger */ + /** @var LoggerInterface */ protected $logger; /** @var ISecureRandom */ protected $random; - public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) { + public function __construct(IL10N $trans, SystemConfig $config, LoggerInterface $logger, ISecureRandom $random) { $this->trans = $trans; $this->config = $config; $this->logger = $logger; diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php index 229d47160f5..c5c921cecd8 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php @@ -34,7 +34,6 @@ namespace OC\Setup; use OC\DB\ConnectionAdapter; use OC\DB\MySqlTools; use OCP\IDBConnection; -use OCP\ILogger; use Doctrine\DBAL\Platforms\MySQL80Platform; use OCP\Security\ISecureRandom; @@ -66,7 +65,9 @@ class MySQL extends AbstractDatabase { try { $connection->connect(); } catch (\Exception $e) { - $this->logger->logException($e); + $this->logger->error($e->getMessage(), [ + 'exception' => $e, + ]); throw new \OC\DatabaseSetupException($this->trans->t('MySQL username and/or password not valid'), $this->trans->t('You need to enter details of an existing account.'), 0, $e); } @@ -84,9 +85,8 @@ class MySQL extends AbstractDatabase { $query = "CREATE DATABASE IF NOT EXISTS `$name` CHARACTER SET $characterSet COLLATE ${characterSet}_bin;"; $connection->executeUpdate($query); } catch (\Exception $ex) { - $this->logger->logException($ex, [ - 'message' => 'Database creation failed.', - 'level' => ILogger::ERROR, + $this->logger->error('Database creation failed.', [ + 'exception' => $ex, 'app' => 'mysql.setup', ]); return; @@ -97,9 +97,8 @@ class MySQL extends AbstractDatabase { $query = "GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `$name` . * TO '$user'"; $connection->executeUpdate($query); } catch (\Exception $ex) { - $this->logger->logException($ex, [ - 'message' => 'Could not automatically grant privileges, this can be ignored if database user already had privileges.', - 'level' => ILogger::DEBUG, + $this->logger->debug('Could not automatically grant privileges, this can be ignored if database user already had privileges.', [ + 'exception' => $ex, 'app' => 'mysql.setup', ]); } @@ -128,9 +127,8 @@ class MySQL extends AbstractDatabase { $connection->executeUpdate($query); } } catch (\Exception $ex) { - $this->logger->logException($ex, [ - 'message' => 'Database user creation failed.', - 'level' => ILogger::ERROR, + $this->logger->error('Database user creation failed.',[ + 'exception' => $ex, 'app' => 'mysql.setup', ]); } @@ -180,9 +178,8 @@ class MySQL extends AbstractDatabase { } } } catch (\Exception $ex) { - $this->logger->logException($ex, [ - 'message' => 'Can not create a new MySQL user, will continue with the provided user.', - 'level' => ILogger::INFO, + $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ + 'exception' => $ex, 'app' => 'mysql.setup', ]); } diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php index 7e59bf297f1..40386666341 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -82,8 +82,9 @@ class PostgreSQL extends AbstractDatabase { // the connection to dbname=postgres is not needed anymore $connection->close(); } catch (\Exception $e) { - $this->logger->logException($e); - $this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created'); + $this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created', [ + 'exception' => $e, + ]); $this->config->setValues([ 'dbuser' => $this->dbUser, 'dbpassword' => $this->dbPassword, @@ -97,7 +98,9 @@ class PostgreSQL extends AbstractDatabase { try { $connection->connect(); } catch (\Exception $e) { - $this->logger->logException($e); + $this->logger->error($e->getMessage(), [ + 'exception' => $e, + ]); throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'), $this->trans->t('You need to enter details of an existing account.'), 0, $e); } @@ -110,16 +113,18 @@ class PostgreSQL extends AbstractDatabase { try { $query->execute(); } catch (DatabaseException $e) { - $this->logger->error('Error while trying to create database'); - $this->logger->logException($e); + $this->logger->error('Error while trying to create database', [ + 'exception' => $e, + ]); } } else { $query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC"); try { $query->execute(); } catch (DatabaseException $e) { - $this->logger->error('Error while trying to restrict database permissions'); - $this->logger->logException($e); + $this->logger->error('Error while trying to restrict database permissions', [ + 'exception' => $e, + ]); } } } @@ -161,8 +166,9 @@ class PostgreSQL extends AbstractDatabase { $query->execute(); } } catch (DatabaseException $e) { - $this->logger->error('Error while trying to create database user'); - $this->logger->logException($e); + $this->logger->error('Error while trying to create database user', [ + 'exception' => $e, + ]); } } } diff --git a/lib/private/Template/Base.php b/lib/private/Template/Base.php index c95958ceea1..65d0ad469ff 100644 --- a/lib/private/Template/Base.php +++ b/lib/private/Template/Base.php @@ -168,7 +168,9 @@ class Base { if (!is_null($additionalParams)) { $_ = array_merge($additionalParams, $this->vars); foreach ($_ as $var => $value) { - ${$var} = $value; + if (!isset(${$var})) { + ${$var} = $value; + } } } diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 4fc6fd5799d..8d21161b1f1 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -62,7 +62,7 @@ use Symfony\Component\EventDispatcher\GenericEvent; */ class Updater extends BasicEmitter { - /** @var ILogger $log */ + /** @var LoggerInterface */ private $log; /** @var IConfig */ @@ -82,15 +82,9 @@ class Updater extends BasicEmitter { 4 => 'Fatal', ]; - /** - * @param IConfig $config - * @param Checker $checker - * @param ILogger $log - * @param Installer $installer - */ public function __construct(IConfig $config, Checker $checker, - ILogger $log = null, + ?LoggerInterface $log, Installer $installer) { $this->log = $log; $this->config = $config; @@ -135,11 +129,15 @@ class Updater extends BasicEmitter { try { $this->doUpgrade($currentVersion, $installedVersion); } catch (HintException $exception) { - $this->log->logException($exception, ['app' => 'core']); + $this->log->error($exception->getMessage(), [ + 'exception' => $exception, + ]); $this->emit('\OC\Updater', 'failure', [$exception->getMessage() . ': ' .$exception->getHint()]); $success = false; } catch (\Exception $exception) { - $this->log->logException($exception, ['app' => 'core']); + $this->log->error($exception->getMessage(), [ + 'exception' => $exception, + ]); $this->emit('\OC\Updater', 'failure', [get_class($exception) . ': ' .$exception->getMessage()]); $success = false; } @@ -275,7 +273,10 @@ class Updater extends BasicEmitter { $errors = Installer::installShippedApps(true); foreach ($errors as $appId => $exception) { /** @var \Exception $exception */ - $this->log->logException($exception, ['app' => $appId]); + $this->log->error($exception->getMessage(), [ + 'exception' => $exception, + 'app' => $appId, + ]); $this->emit('\OC\Updater', 'failure', [$appId . ': ' . $exception->getMessage()]); } @@ -427,7 +428,9 @@ class Updater extends BasicEmitter { $ocApp->enable($app); } } catch (\Exception $ex) { - $this->log->logException($ex, ['app' => 'core']); + $this->log->error($ex->getMessage(), [ + 'exception' => $ex, + ]); } } } diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index c33d79b83cf..5e6501f9045 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -599,6 +599,8 @@ class Session implements IUserSession, Emitter { return true; } + // If credentials were provided, they need to be valid, otherwise we do boom + throw new LoginException(); } catch (PasswordLoginForbiddenException $ex) { // Nothing to do } diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index f1e88166e97..63eaf303759 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -747,10 +747,10 @@ class OC_Util { $config, \OC::$server->get(IniGetWrapper::class), \OC::$server->getL10N('lib'), - \OC::$server->query(\OCP\Defaults::class), - \OC::$server->getLogger(), + \OC::$server->get(\OCP\Defaults::class), + \OC::$server->get(LoggerInterface::class), \OC::$server->getSecureRandom(), - \OC::$server->query(\OC\Installer::class) + \OC::$server->get(\OC\Installer::class) ); $urlGenerator = \OC::$server->getURLGenerator(); diff --git a/lib/public/RichObjectStrings/Definitions.php b/lib/public/RichObjectStrings/Definitions.php index c59855e957b..5c85a163233 100644 --- a/lib/public/RichObjectStrings/Definitions.php +++ b/lib/public/RichObjectStrings/Definitions.php @@ -418,6 +418,37 @@ class Definitions { ], ], ], + 'geo-location' => [ + 'author' => 'Nextcloud', + 'app' => 'core', + 'since' => '22.0.0', + 'parameters' => [ + 'id' => [ + 'since' => '22.0.0', + 'required' => true, + 'description' => 'The geo URI (https://en.wikipedia.org/wiki/Geo_URI_scheme) to identify the location', + 'example' => 'geo:52.5450511,13.3741463', + ], + 'name' => [ + 'since' => '22.0.0', + 'required' => true, + 'description' => 'A description of the location', + 'example' => 'Nextcloud Berlin Office', + ], + 'latitude' => [ + 'since' => '22.0.0', + 'required' => true, + 'description' => 'The latitude of the location MUST be the same as in the id', + 'example' => '52.5450511', + ], + 'longitude' => [ + 'since' => '22.0.0', + 'required' => true, + 'description' => 'The longitude of the location MUST be the same as in the id', + 'example' => '13.3741463', + ], + ], + ], 'open-graph' => [ 'author' => 'Maxence Lange', 'app' => 'mood', diff --git a/tests/lib/Accounts/AccountManagerTest.php b/tests/lib/Accounts/AccountManagerTest.php index 27ebed69793..687ae29ff7b 100644 --- a/tests/lib/Accounts/AccountManagerTest.php +++ b/tests/lib/Accounts/AccountManagerTest.php @@ -455,4 +455,30 @@ class AccountManagerTest extends TestCase { self::assertEquals($phoneNumber, self::invokePrivate($instance, 'parsePhoneNumber', [$phoneInput])); } } + + public function dataParseWebsite(): array { + return [ + ['https://nextcloud.com', 'https://nextcloud.com'], + ['http://nextcloud.com', 'http://nextcloud.com'], + ['ftp://nextcloud.com', null], + ['//nextcloud.com/', null], + ['https:///?query', null], + ]; + } + + /** + * @dataProvider dataParseWebsite + * @param string $websiteInput + * @param string|null $websiteOutput + */ + public function testParseWebsite(string $websiteInput, ?string $websiteOutput): void { + $instance = $this->getInstance(); + + if ($websiteOutput === null) { + $this->expectException(\InvalidArgumentException::class); + self::invokePrivate($instance, 'parseWebsite', [$websiteInput]); + } else { + self::assertEquals($websiteOutput, self::invokePrivate($instance, 'parseWebsite', [$websiteInput])); + } + } } diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php index 5b6fedb1cc2..db2f117cb9b 100644 --- a/tests/lib/App/AppManagerTest.php +++ b/tests/lib/App/AppManagerTest.php @@ -20,10 +20,10 @@ use OCP\ICacheFactory; use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; -use OCP\ILogger; use OCP\IUser; use OCP\IUserSession; use PHPUnit\Framework\MockObject\MockObject; +use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; @@ -93,7 +93,7 @@ class AppManagerTest extends TestCase { /** @var EventDispatcherInterface|MockObject */ protected $eventDispatcher; - /** @var ILogger|MockObject */ + /** @var LoggerInterface|MockObject */ protected $logger; /** @var IAppManager */ @@ -109,7 +109,7 @@ class AppManagerTest extends TestCase { $this->cacheFactory = $this->createMock(ICacheFactory::class); $this->cache = $this->createMock(ICache::class); $this->eventDispatcher = $this->createMock(EventDispatcherInterface::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->cacheFactory->expects($this->any()) ->method('createDistributed') ->with('settings') diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php index f9696cc1b00..840d47ed802 100644 --- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php @@ -34,7 +34,7 @@ use OCP\Http\Client\IClient; use OCP\Http\Client\IClientService; use OCP\Http\Client\IResponse; use OCP\IConfig; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use Test\TestCase; class AppFetcherTest extends TestCase { @@ -48,7 +48,7 @@ class AppFetcherTest extends TestCase { protected $config; /** @var CompareVersion|\PHPUnit\Framework\MockObject\MockObject */ protected $compareVersion; - /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ + /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; /** @var AppFetcher */ protected $fetcher; @@ -1848,7 +1848,7 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg== $this->timeFactory = $this->createMock(ITimeFactory::class); $this->config = $this->createMock(IConfig::class); $this->compareVersion = new CompareVersion(); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->fetcher = new AppFetcher( $factory, diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php index 531fdf41e78..735df939965 100644 --- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php +++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php @@ -33,7 +33,7 @@ use OCP\Http\Client\IClient; use OCP\Http\Client\IClientService; use OCP\Http\Client\IResponse; use OCP\IConfig; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use Test\TestCase; abstract class FetcherBase extends TestCase { @@ -47,7 +47,7 @@ abstract class FetcherBase extends TestCase { protected $timeFactory; /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ protected $config; - /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ + /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $logger; /** @var Fetcher */ protected $fetcher; @@ -67,7 +67,7 @@ abstract class FetcherBase extends TestCase { $this->clientService = $this->createMock(IClientService::class); $this->timeFactory = $this->createMock(ITimeFactory::class); $this->config = $this->createMock(IConfig::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); } public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion() { diff --git a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php index 1fca34423d5..05442455cb7 100644 --- a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php +++ b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php @@ -35,9 +35,9 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\AppFramework\QueryException; use OCP\Dashboard\IManager; use OCP\EventDispatcher\IEventDispatcher; -use OCP\ILogger; use OCP\IServerContainer; use PHPUnit\Framework\MockObject\MockObject; +use Psr\Log\LoggerInterface; use Test\TestCase; class CoordinatorTest extends TestCase { @@ -57,7 +57,7 @@ class CoordinatorTest extends TestCase { /** @var IEventDispatcher|MockObject */ private $eventDispatcher; - /** @var ILogger|MockObject */ + /** @var LoggerInterface|MockObject */ private $logger; /** @var Coordinator */ @@ -71,7 +71,7 @@ class CoordinatorTest extends TestCase { $this->crashReporterRegistry = $this->createMock(Registry::class); $this->dashboardManager = $this->createMock(IManager::class); $this->eventDispatcher = $this->createMock(IEventDispatcher::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->coordinator = new Coordinator( $this->serverContainer, diff --git a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php index e304a63cfc4..f97ac92e887 100644 --- a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php +++ b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php @@ -29,13 +29,13 @@ use OC\AppFramework\Bootstrap\RegistrationContext; use OCP\AppFramework\App; use OCP\AppFramework\IAppContainer; use OCP\EventDispatcher\IEventDispatcher; -use OCP\ILogger; use PHPUnit\Framework\MockObject\MockObject; +use Psr\Log\LoggerInterface; use Test\TestCase; class RegistrationContextTest extends TestCase { - /** @var ILogger|MockObject */ + /** @var LoggerInterface|MockObject */ private $logger; /** @var RegistrationContext */ @@ -44,7 +44,7 @@ class RegistrationContextTest extends TestCase { protected function setUp(): void { parent::setUp(); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->context = new RegistrationContext( $this->logger diff --git a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php index 0d27a9a070f..aa713b99156 100644 --- a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php @@ -26,13 +26,16 @@ use OC\AppFramework\Utility\ControllerMethodReflector; use OC\Security\RateLimiting\Exception\RateLimitExceededException; use OC\Security\RateLimiting\Limiter; use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\IRequest; use OCP\IUser; use OCP\IUserSession; use Test\TestCase; +/** + * @group DB + */ class RateLimitingMiddlewareTest extends TestCase { /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; @@ -250,11 +253,7 @@ class RateLimitingMiddlewareTest extends TestCase { ->willReturn('JSON'); $result = $this->rateLimitingMiddleware->afterException($controller, 'testMethod', new RateLimitExceededException()); - $expected = new JSONResponse( - [ - 'message' => 'Rate limit exceeded', - ], - 429 + $expected = new DataResponse([], 429 ); $this->assertEquals($expected, $result); } @@ -271,13 +270,12 @@ class RateLimitingMiddlewareTest extends TestCase { $result = $this->rateLimitingMiddleware->afterException($controller, 'testMethod', new RateLimitExceededException()); $expected = new TemplateResponse( 'core', - '403', - [ - 'file' => 'Rate limit exceeded', - ], - 'guest' + '429', + [], + TemplateResponse::RENDER_AS_GUEST ); $expected->setStatus(429); $this->assertEquals($expected, $result); + $this->assertIsString($result->render()); } } diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index a3c9efa557c..076f6588d94 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -39,11 +39,11 @@ use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\IConfig; use OCP\IL10N; -use OCP\ILogger; use OCP\INavigationManager; use OCP\IRequest; use OCP\IURLGenerator; use OCP\Security\ISecureRandom; +use Psr\Log\LoggerInterface; class SecurityMiddlewareTest extends \Test\TestCase { @@ -59,7 +59,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { private $request; /** @var ControllerMethodReflector */ private $reader; - /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ + /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */ private $logger; /** @var INavigationManager|\PHPUnit\Framework\MockObject\MockObject */ private $navigationManager; @@ -75,7 +75,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { $this->controller = $this->createMock(Controller::class); $this->reader = new ControllerMethodReflector(); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->navigationManager = $this->createMock(INavigationManager::class); $this->urlGenerator = $this->createMock(IURLGenerator::class); $this->request = $this->createMock(IRequest::class); diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php index 7ada4ec746a..22fad4ab61f 100644 --- a/tests/lib/AppTest.php +++ b/tests/lib/AppTest.php @@ -13,6 +13,7 @@ use OC\App\AppManager; use OC\App\InfoParser; use OC\AppConfig; use OCP\IAppConfig; +use Psr\Log\LoggerInterface; /** * Class AppTest @@ -477,7 +478,7 @@ class AppTest extends \Test\TestCase { 'appforgroup2' => '["group2"]', 'appforgroup12' => '["group2","group1"]', ] - + ); $apps = \OC_App::getEnabledApps(false, $forceAll); @@ -512,7 +513,7 @@ class AppTest extends \Test\TestCase { 'app3' => 'yes', 'app2' => 'no', ] - + ); $apps = \OC_App::getEnabledApps(); @@ -554,7 +555,7 @@ class AppTest extends \Test\TestCase { \OC::$server->getGroupManager(), \OC::$server->getMemCacheFactory(), \OC::$server->getEventDispatcher(), - \OC::$server->getLogger() + \OC::$server->get(LoggerInterface::class) )); } diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php index 1b813b5f36b..d9c565a3f6d 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php @@ -32,15 +32,16 @@ use OC\AppFramework\Bootstrap\ServiceRegistration; use OC\Authentication\TwoFactorAuth\ProviderLoader; use OCP\App\IAppManager; use OCP\Authentication\TwoFactorAuth\IProvider; +use OCP\IUser; use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; class ProviderLoaderTest extends TestCase { - /** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */ + /** @var IAppManager|MockObject */ private $appManager; - /** @var \OCP\IUser|\PHPUnit\Framework\MockObject\MockObject */ + /** @var IUser|MockObject */ private $user; /** @var RegistrationContext|MockObject */ @@ -53,7 +54,7 @@ class ProviderLoaderTest extends TestCase { parent::setUp(); $this->appManager = $this->createMock(IAppManager::class); - $this->user = $this->createMock(\OCP\IUser::class); + $this->user = $this->createMock(IUser::class); $this->registrationContext = $this->createMock(RegistrationContext::class); $coordinator = $this->createMock(Coordinator::class); @@ -123,7 +124,7 @@ class ProviderLoaderTest extends TestCase { ->with($this->user) ->willReturn([]); - $this->registrationContext->method('getTwoFactorProvider') + $this->registrationContext->method('getTwoFactorProviders') ->willReturn([ new ServiceRegistration('twofactor_test', '\\OCA\\TwoFactorTest\\Provider') ]); diff --git a/tests/lib/Avatar/AvatarManagerTest.php b/tests/lib/Avatar/AvatarManagerTest.php index d3bc60efb59..ce6981a2a21 100644 --- a/tests/lib/Avatar/AvatarManagerTest.php +++ b/tests/lib/Avatar/AvatarManagerTest.php @@ -36,9 +36,9 @@ use OCP\Files\IAppData; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\IConfig; use OCP\IL10N; -use OCP\ILogger; use OCP\IUser; use OCP\IUserSession; +use Psr\Log\LoggerInterface; /** * Class AvatarManagerTest @@ -52,7 +52,7 @@ class AvatarManagerTest extends \Test\TestCase { private $appData; /** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */ private $l10n; - /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ + /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */ private $logger; /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; @@ -70,7 +70,7 @@ class AvatarManagerTest extends \Test\TestCase { $this->userManager = $this->createMock(Manager::class); $this->appData = $this->createMock(IAppData::class); $this->l10n = $this->createMock(IL10N::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->config = $this->createMock(IConfig::class); $this->accountManager = $this->createMock(IAccountManager::class); $this->knownUserService = $this->createMock(KnownUserService::class); @@ -247,7 +247,7 @@ class AvatarManagerTest extends \Test\TestCase { } if ($expectedPlaceholder) { - $expected = new PlaceholderAvatar($folder, $user, $this->createMock(ILogger::class)); + $expected = new PlaceholderAvatar($folder, $user, $this->createMock(LoggerInterface::class)); } else { $expected = new UserAvatar($folder, $this->l10n, $user, $this->logger, $this->config); } diff --git a/tests/lib/Avatar/GuestAvatarTest.php b/tests/lib/Avatar/GuestAvatarTest.php index 1c424234f10..b8e6d8ae2e8 100644 --- a/tests/lib/Avatar/GuestAvatarTest.php +++ b/tests/lib/Avatar/GuestAvatarTest.php @@ -26,8 +26,8 @@ namespace Test\Avatar; use OC\Avatar\GuestAvatar; use OCP\Files\SimpleFS\InMemoryFile; -use OCP\ILogger; use PHPUnit\Framework\MockObject\MockObject; +use Psr\Log\LoggerInterface; use Test\TestCase; /** @@ -48,8 +48,8 @@ class GuestAvatarTest extends TestCase { * @return void */ public function setupGuestAvatar() { - /* @var MockObject|ILogger $logger */ - $logger = $this->getMockBuilder(ILogger::class)->getMock(); + /* @var MockObject|LoggerInterface $logger */ + $logger = $this->getMockBuilder(LoggerInterface::class)->getMock(); $this->guestAvatar = new GuestAvatar('einstein', $logger); } diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php index 31f2a6ebf5b..3570f2017d5 100644 --- a/tests/lib/Avatar/UserAvatarTest.php +++ b/tests/lib/Avatar/UserAvatarTest.php @@ -16,7 +16,7 @@ use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\IConfig; use OCP\IL10N; -use OCP\ILogger; +use Psr\Log\LoggerInterface; class UserAvatarTest extends \Test\TestCase { /** @var Folder | \PHPUnit\Framework\MockObject\MockObject */ @@ -309,7 +309,7 @@ class UserAvatarTest extends \Test\TestCase { $this->folder, $l, $user, - $this->createMock(ILogger::class), + $this->createMock(LoggerInterface::class), $this->config ); } diff --git a/tests/lib/CapabilitiesManagerTest.php b/tests/lib/CapabilitiesManagerTest.php index 536355f9697..4909272c4a8 100644 --- a/tests/lib/CapabilitiesManagerTest.php +++ b/tests/lib/CapabilitiesManagerTest.php @@ -25,19 +25,19 @@ use OC\CapabilitiesManager; use OCP\AppFramework\QueryException; use OCP\Capabilities\ICapability; use OCP\Capabilities\IPublicCapability; -use OCP\ILogger; +use Psr\Log\LoggerInterface; class CapabilitiesManagerTest extends TestCase { /** @var CapabilitiesManager */ private $manager; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; protected function setUp(): void { parent::setUp(); - $this->logger = $this->getMockBuilder(ILogger::class)->getMock(); + $this->logger = $this->getMockBuilder(LoggerInterface::class)->getMock(); $this->manager = new CapabilitiesManager($this->logger); } @@ -139,7 +139,7 @@ class CapabilitiesManagerTest extends TestCase { ] ] ]; - + $this->assertEquals($expected, $res); } diff --git a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php index 81279c4c569..3ec9e6f5efc 100644 --- a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php @@ -33,25 +33,26 @@ use OCP\Http\Client\IClient; use OCP\Http\Client\IClientService; use OCP\Http\Client\IResponse; use OCP\IConfig; -use OCP\ILogger; use OCP\IUser; use OCP\IUserSession; use OCP\Share\IShare; +use PHPUnit\Framework\MockObject\MockObject; +use Psr\Log\LoggerInterface; use Test\TestCase; class LookupPluginTest extends TestCase { - /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ + /** @var IConfig|MockObject */ protected $config; - /** @var IClientService|\PHPUnit\Framework\MockObject\MockObject */ + /** @var IClientService|MockObject */ protected $clientService; - /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */ + /** @var IUserSession|MockObject */ protected $userSession; - /** @var ICloudIdManager|\PHPUnit\Framework\MockObject\MockObject */ + /** @var ICloudIdManager|MockObject */ protected $cloudIdManager; /** @var LookupPlugin */ protected $plugin; - /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ + /** @var LoggerInterface|MockObject */ protected $logger; protected function setUp(): void { @@ -60,7 +61,7 @@ class LookupPluginTest extends TestCase { $this->userSession = $this->createMock(IUserSession::class); $this->cloudIdManager = $this->createMock(ICloudIdManager::class); $this->config = $this->createMock(IConfig::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->clientService = $this->createMock(IClientService::class); $cloudId = $this->createMock(ICloudId::class); $cloudId->expects($this->any())->method('getRemote')->willReturn('myNextcloud.net'); @@ -108,7 +109,7 @@ class LookupPluginTest extends TestCase { $this->clientService->expects($this->never()) ->method('newClient'); - /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ + /** @var ISearchResult|MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $this->plugin->search('foobar', 10, 0, $searchResult); @@ -132,7 +133,7 @@ class LookupPluginTest extends TestCase { $this->clientService->expects($this->never()) ->method('newClient'); - /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ + /** @var ISearchResult|MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $this->plugin->search('foobar', 10, 0, $searchResult); @@ -145,7 +146,7 @@ class LookupPluginTest extends TestCase { public function testSearch(array $searchParams) { $type = new SearchResultType('lookup'); - /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ + /** @var ISearchResult|MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $searchResult->expects($this->once()) ->method('addResultSet') @@ -207,7 +208,7 @@ class LookupPluginTest extends TestCase { public function testSearchEnableDisableLookupServer(array $searchParams, $GSEnabled, $LookupEnabled) { $type = new SearchResultType('lookup'); - /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ + /** @var ISearchResult|MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $this->config->expects($this->once()) @@ -269,7 +270,7 @@ class LookupPluginTest extends TestCase { ->with('files_sharing', 'lookupServerEnabled', 'yes') ->willReturn('no'); - /** @var ISearchResult|\PHPUnit\Framework\MockObject\MockObject $searchResult */ + /** @var ISearchResult|MockObject $searchResult */ $searchResult = $this->createMock(ISearchResult::class); $searchResult->expects($this->never()) ->method('addResultSet'); diff --git a/tests/lib/Collaboration/Resources/ManagerTest.php b/tests/lib/Collaboration/Resources/ManagerTest.php index 092d4ffd39c..01a39660a7c 100644 --- a/tests/lib/Collaboration/Resources/ManagerTest.php +++ b/tests/lib/Collaboration/Resources/ManagerTest.php @@ -27,12 +27,12 @@ use OC\Collaboration\Resources\Manager; use OCP\Collaboration\Resources\IManager; use OCP\Collaboration\Resources\IProviderManager; use OCP\IDBConnection; -use OCP\ILogger; +use Psr\Log\LoggerInterface; use Test\TestCase; class ManagerTest extends TestCase { - /** @var ILogger */ + /** @var LoggerInterface */ protected $logger; /** @var IProviderManager */ protected $providerManager; @@ -42,14 +42,14 @@ class ManagerTest extends TestCase { protected function setUp(): void { parent::setUp(); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->providerManager = $this->createMock(IProviderManager::class); /** @var IDBConnection $connection */ $connection = $this->createMock(IDBConnection::class); $this->manager = new Manager($connection, $this->providerManager, $this->logger); } - + public function testRegisterResourceProvider(): void { $this->logger->expects($this->once()) ->method('debug') diff --git a/tests/lib/Collaboration/Resources/ProviderManagerTest.php b/tests/lib/Collaboration/Resources/ProviderManagerTest.php index 751e2cc1f8d..19a34962a56 100644 --- a/tests/lib/Collaboration/Resources/ProviderManagerTest.php +++ b/tests/lib/Collaboration/Resources/ProviderManagerTest.php @@ -27,15 +27,15 @@ use OC\Collaboration\Resources\ProviderManager; use OCA\Files\Collaboration\Resources\ResourceProvider; use OCP\AppFramework\QueryException; use OCP\Collaboration\Resources\IProviderManager; -use OCP\ILogger; use OCP\IServerContainer; +use Psr\Log\LoggerInterface; use Test\TestCase; class ProviderManagerTest extends TestCase { /** @var IServerContainer */ protected $serverContainer; - /** @var ILogger */ + /** @var LoggerInterface */ protected $logger; /** @var IProviderManager */ protected $providerManager; @@ -44,7 +44,7 @@ class ProviderManagerTest extends TestCase { parent::setUp(); $this->serverContainer = $this->createMock(IServerContainer::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->providerManager = new class($this->serverContainer, $this->logger) extends ProviderManager { public function countProviders(): int { diff --git a/tests/lib/InitialStateServiceTest.php b/tests/lib/InitialStateServiceTest.php index 30eca056206..2a23774baf1 100644 --- a/tests/lib/InitialStateServiceTest.php +++ b/tests/lib/InitialStateServiceTest.php @@ -27,10 +27,10 @@ namespace Test; use OC\AppFramework\Bootstrap\Coordinator; use OCP\IServerContainer; +use Psr\Log\LoggerInterface; use function json_encode; use JsonSerializable; use OC\InitialStateService; -use OCP\ILogger; use stdClass; class InitialStateServiceTest extends TestCase { @@ -42,7 +42,7 @@ class InitialStateServiceTest extends TestCase { parent::setUp(); $this->service = new InitialStateService( - $this->createMock(ILogger::class), + $this->createMock(LoggerInterface::class), $this->createMock(Coordinator::class), $this->createMock(IServerContainer::class) ); diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php index 2626e047c74..c49f8bf76a5 100644 --- a/tests/lib/InstallerTest.php +++ b/tests/lib/InstallerTest.php @@ -14,8 +14,8 @@ use OC\Installer; use OCP\Http\Client\IClient; use OCP\Http\Client\IClientService; use OCP\IConfig; -use OCP\ILogger; use OCP\ITempManager; +use Psr\Log\LoggerInterface; /** * Class InstallerTest @@ -32,7 +32,7 @@ class InstallerTest extends TestCase { private $clientService; /** @var ITempManager|\PHPUnit\Framework\MockObject\MockObject */ private $tempManager; - /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */ + /** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */ private $logger; /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */ private $config; @@ -43,7 +43,7 @@ class InstallerTest extends TestCase { $this->appFetcher = $this->createMock(AppFetcher::class); $this->clientService = $this->createMock(IClientService::class); $this->tempManager = $this->createMock(ITempManager::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->config = $this->createMock(IConfig::class); $config = \OC::$server->getConfig(); @@ -53,7 +53,7 @@ class InstallerTest extends TestCase { \OC::$server->getAppFetcher(), \OC::$server->getHTTPClientService(), \OC::$server->getTempManager(), - \OC::$server->getLogger(), + \OC::$server->get(LoggerInterface::class), $config, false ); @@ -76,7 +76,7 @@ class InstallerTest extends TestCase { \OC::$server->getAppFetcher(), \OC::$server->getHTTPClientService(), \OC::$server->getTempManager(), - \OC::$server->getLogger(), + \OC::$server->get(LoggerInterface::class), \OC::$server->getConfig(), false ); @@ -100,7 +100,7 @@ class InstallerTest extends TestCase { \OC::$server->getAppFetcher(), \OC::$server->getHTTPClientService(), \OC::$server->getTempManager(), - \OC::$server->getLogger(), + \OC::$server->get(LoggerInterface::class), \OC::$server->getConfig(), false ); diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php index 696e1d69fbe..004fc9c866b 100644 --- a/tests/lib/SetupTest.php +++ b/tests/lib/SetupTest.php @@ -14,26 +14,27 @@ use OC\Setup; use OC\SystemConfig; use OCP\Defaults; use OCP\IL10N; -use OCP\ILogger; use OCP\Security\ISecureRandom; +use PHPUnit\Framework\MockObject\MockObject; +use Psr\Log\LoggerInterface; class SetupTest extends \Test\TestCase { - /** @var SystemConfig|\PHPUnit\Framework\MockObject\MockObject */ + /** @var SystemConfig|MockObject */ protected $config; - /** @var \bantu\IniGetWrapper\IniGetWrapper|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \bantu\IniGetWrapper\IniGetWrapper|MockObject */ private $iniWrapper; - /** @var \OCP\IL10N|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \OCP\IL10N|MockObject */ private $l10n; - /** @var Defaults|\PHPUnit\Framework\MockObject\MockObject */ + /** @var Defaults|MockObject */ private $defaults; - /** @var \OC\Setup|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \OC\Setup|MockObject */ protected $setupClass; - /** @var \OCP\ILogger|\PHPUnit\Framework\MockObject\MockObject */ + /** @var LoggerInterface|MockObject */ protected $logger; - /** @var \OCP\Security\ISecureRandom|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \OCP\Security\ISecureRandom|MockObject */ protected $random; - /** @var Installer|\PHPUnit\Framework\MockObject\MockObject */ + /** @var Installer|MockObject */ protected $installer; protected function setUp(): void { @@ -43,7 +44,7 @@ class SetupTest extends \Test\TestCase { $this->iniWrapper = $this->createMock(IniGetWrapper::class); $this->l10n = $this->createMock(IL10N::class); $this->defaults = $this->createMock(Defaults::class); - $this->logger = $this->createMock(ILogger::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->random = $this->createMock(ISecureRandom::class); $this->installer = $this->createMock(Installer::class); $this->setupClass = $this->getMockBuilder(Setup::class) diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php index 1affd6d020a..5a7422cbad5 100644 --- a/tests/lib/UpdaterTest.php +++ b/tests/lib/UpdaterTest.php @@ -22,22 +22,23 @@ namespace Test; +use PHPUnit\Framework\MockObject\MockObject; +use Psr\Log\LoggerInterface; use OC\Installer; use OC\IntegrityCheck\Checker; use OC\Updater; use OCP\IConfig; -use OCP\ILogger; class UpdaterTest extends TestCase { - /** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */ + /** @var IConfig|MockObject */ private $config; - /** @var ILogger | \PHPUnit\Framework\MockObject\MockObject */ + /** @var LoggerInterface|MockObject */ private $logger; /** @var Updater */ private $updater; - /** @var Checker | \PHPUnit\Framework\MockObject\MockObject */ + /** @var Checker|MockObject */ private $checker; - /** @var Installer|\PHPUnit\Framework\MockObject\MockObject */ + /** @var Installer|MockObject */ private $installer; protected function setUp(): void { @@ -45,7 +46,7 @@ class UpdaterTest extends TestCase { $this->config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() ->getMock(); - $this->logger = $this->getMockBuilder(ILogger::class) + $this->logger = $this->getMockBuilder(LoggerInterface::class) ->disableOriginalConstructor() ->getMock(); $this->checker = $this->getMockBuilder(Checker::class) |