diff options
Diffstat (limited to 'apps')
121 files changed, 394 insertions, 293 deletions
diff --git a/apps/comments/css/comments.css b/apps/comments/css/comments.css index 796a550227b..2d794d52708 100644 --- a/apps/comments/css/comments.css +++ b/apps/comments/css/comments.css @@ -54,7 +54,6 @@ #commentsTabView .comment { position: relative; - z-index: 1; margin-bottom: 30px; } @@ -108,6 +107,11 @@ vertical-align: middle; } +#commentsTabView .authorRow>div.hidden { + display: none !important; +} + +#commentsTabView .comments li .message .avatar-name-wrapper, #commentsTabView .comment .authorRow { position: relative; } diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 2256bea943e..ace0862ad2e 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -232,6 +232,21 @@ var $this = $(this); $this.avatar($this.attr('data-username'), 32); }); + + var username = $el.find('.avatar').data('username'); + if (username !== oc_current_user) { + $el.find('.authorRow .avatar, .authorRow .author').contactsMenu( + username, 0, $el.find('.authorRow')); + } + + var message = $el.find('.message'); + message.find('.avatar').each(function() { + var avatar = $(this); + var strong = $(this).next(); + var appendTo = $(this).parent(); + + $.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo); + }); }, /** @@ -251,7 +266,10 @@ // escape possible regex characters in the name mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); - var displayName = avatar + ' <strong>'+ _.escape(mentions[i].mentionDisplayName)+'</strong>'; + var displayName = '' + + '<span class="avatar-name-wrapper">' + + avatar + ' <strong>'+ _.escape(mentions[i].mentionDisplayName)+'</strong>' + + '</span>'; // replace every mention either at the start of the input or after a whitespace // followed by a non-word character. diff --git a/apps/comments/tests/js/commentstabviewSpec.js b/apps/comments/tests/js/commentstabviewSpec.js index 0bbfaa1f295..c961548d806 100644 --- a/apps/comments/tests/js/commentstabviewSpec.js +++ b/apps/comments/tests/js/commentstabviewSpec.js @@ -153,7 +153,7 @@ describe('OCA.Comments.CommentsTabView tests', function() { expect($comment.find('strong:first').text()).toEqual('Thane of Cawdor'); expect($comment.find('.avatar[data-user=banquo]').length).toEqual(1); - expect($comment.find('strong:last-child').text()).toEqual('Lord Banquo'); + expect($comment.find('.avatar-name-wrapper:last-child strong').text()).toEqual('Lord Banquo'); }); }); diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index cd010b87f08..5deb648fa7f 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -882,16 +882,15 @@ class CardDavBackend implements BackendInterface, SyncSupport { public function search($addressBookId, $pattern, $searchProperties) { $query = $this->db->getQueryBuilder(); $query2 = $this->db->getQueryBuilder(); + $query2->selectDistinct('cp.cardid')->from($this->dbCardsPropertiesTable, 'cp'); + $query2->andWhere($query2->expr()->eq('cp.addressbookid', $query->createNamedParameter($addressBookId))); + $or = $query2->expr()->orX(); foreach ($searchProperties as $property) { - $query2->orWhere( - $query2->expr()->andX( - $query2->expr()->eq('cp.name', $query->createNamedParameter($property)), - $query2->expr()->ilike('cp.value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')) - ) - ); + $or->add($query2->expr()->eq('cp.name', $query->createNamedParameter($property))); } - $query2->andWhere($query2->expr()->eq('cp.addressbookid', $query->createNamedParameter($addressBookId))); + $query2->andWhere($or); + $query2->andWhere($query2->expr()->ilike('cp.value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%'))); $query->select('c.carddata', 'c.uri')->from($this->dbCardsTable, 'c') ->where($query->expr()->in('c.id', $query->createFunction($query2->getSQL()))); diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index 1f878df1564..d0a01ef255b 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -512,6 +512,7 @@ class File extends Node implements IFile { // TODO: in the future use ChunkHandler provided by storage return !$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage') && !$storage->instanceOfStorage('OC\Files\Storage\OwnCloud') && + !$storage->instanceOfStorage('OC\Files\ObjectStore\ObjectStoreStorage') && $storage->needsPartFile(); } diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php index 6ab4bf6f5f4..e2bcb6813b6 100644 --- a/apps/encryption/templates/settings-personal.php +++ b/apps/encryption/templates/settings-personal.php @@ -53,20 +53,20 @@ script('core', 'multiselect'); <br /> <input type='radio' - id='userEnableRecovery' + id='userEnableRecoveryCheckbox' name='userEnableRecovery' value='1' <?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> /> - <label for="userEnableRecovery"><?php p( $l->t( "Enabled" ) ); ?></label> + <label for="userEnableRecoveryCheckbox"><?php p( $l->t( "Enabled" ) ); ?></label> <br /> <input type='radio' - id='userDisableRecovery' + id='userDisableRecoveryCheckbox' name='userEnableRecovery' value='0' <?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> /> - <label for="userDisableRecovery"><?php p( $l->t( "Disabled" ) ); ?></label> + <label for="userDisableRecoveryCheckbox"><?php p( $l->t( "Disabled" ) ); ?></label> </p> <?php endif; ?> </form> diff --git a/apps/federatedfilesharing/l10n/is.js b/apps/federatedfilesharing/l10n/is.js index 56663d5f508..16bbef5aa01 100644 --- a/apps/federatedfilesharing/l10n/is.js +++ b/apps/federatedfilesharing/l10n/is.js @@ -41,6 +41,8 @@ OC.L10N.register( "Open documentation" : "Opna hjálparskjöl", "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", + "Search global and public address book for users and let local users publish their data" : "Leita að notendum í víðværri og opinberri vistfangaskrá og leyfa staðværum notendum að birta gögnin sín", + "Allow users to publish their data to a global and public address book" : "Leifa notendum að birta gögnin sín í víðværri og opinberri vistfangaskrá", "Federated Cloud" : "Skýjasamband (federated)", "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):", "Share it:" : "Deila því:", diff --git a/apps/federatedfilesharing/l10n/is.json b/apps/federatedfilesharing/l10n/is.json index d49de4d2194..fedef654b5c 100644 --- a/apps/federatedfilesharing/l10n/is.json +++ b/apps/federatedfilesharing/l10n/is.json @@ -39,6 +39,8 @@ "Open documentation" : "Opna hjálparskjöl", "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", + "Search global and public address book for users and let local users publish their data" : "Leita að notendum í víðværri og opinberri vistfangaskrá og leyfa staðværum notendum að birta gögnin sín", + "Allow users to publish their data to a global and public address book" : "Leifa notendum að birta gögnin sín í víðværri og opinberri vistfangaskrá", "Federated Cloud" : "Skýjasamband (federated)", "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):", "Share it:" : "Deila því:", diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php index 7343a867d53..ff5cb0084e5 100644 --- a/apps/federatedfilesharing/templates/settings-admin.php +++ b/apps/federatedfilesharing/templates/settings-admin.php @@ -9,6 +9,8 @@ script('federatedfilesharing', 'settings-admin'); <a target="_blank" rel="noreferrer" class="icon-info svg" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a> + <p class="settings-hint"><?php p($l->t('Adjust how people can share between servers.')); ?></p> + <p> <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox" value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> diff --git a/apps/federatedfilesharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php index 98a1cd7f751..126daae27d0 100644 --- a/apps/federatedfilesharing/templates/settings-personal.php +++ b/apps/federatedfilesharing/templates/settings-personal.php @@ -8,6 +8,7 @@ style('federatedfilesharing', 'settings-personal'); <?php if ($_['outgoingServer2serverShareEnabled']): ?> <div id="fileSharingSettings" class="section"> <h2><?php p($l->t('Federated Cloud')); ?></h2> + <p class="settings-hint"><?php p($l->t('You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com')); ?></p> <p> <?php p($l->t('Your Federated Cloud ID:')); ?> @@ -19,7 +20,7 @@ style('federatedfilesharing', 'settings-personal'); <?php if ($_['showShareIT']) {?> <p> - <?php p($l->t('Share it:')); ?><br> + <?php p($l->t('Share it so your friends can share files with you:')); ?><br> <button class="social-facebook pop-up" data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'> Facebook diff --git a/apps/federation/l10n/ca.js b/apps/federation/l10n/ca.js index 3edee3bfa20..9ac7ed3f641 100644 --- a/apps/federation/l10n/ca.js +++ b/apps/federation/l10n/ca.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "El servidor ja està a la llista de servidors de confiança", "No server to federate with found" : "No s\\'ha trobar cap servidor federat", "Could not add server" : "No s'ha pogut afegir el servidor", - "Federation" : "Federació", + "Trusted servers" : "Servidor 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." : "La federació li permet connectar amb altres servidors de confiança per a intercanviar directoris d\\'usuari. Per exemple, això s\\'utilitzarà per als usuaris externs d'auto-completat per a l\\'ús compartit federat.", "Add server automatically once a federated share was created successfully" : "Afegir servidor automàticament quan s'hagi creat una federació correctament", - "Trusted servers" : "Servidor de confiança", "+ Add trusted server" : "+Afegir servidor de confiança", "Trusted server" : "Servidor de confiança", - "Add" : "Afegir" + "Add" : "Afegir", + "Federation" : "Federació" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/ca.json b/apps/federation/l10n/ca.json index d728eb57edc..a6b26b0d840 100644 --- a/apps/federation/l10n/ca.json +++ b/apps/federation/l10n/ca.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "El servidor ja està a la llista de servidors de confiança", "No server to federate with found" : "No s\\'ha trobar cap servidor federat", "Could not add server" : "No s'ha pogut afegir el servidor", - "Federation" : "Federació", + "Trusted servers" : "Servidor 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." : "La federació li permet connectar amb altres servidors de confiança per a intercanviar directoris d\\'usuari. Per exemple, això s\\'utilitzarà per als usuaris externs d'auto-completat per a l\\'ús compartit federat.", "Add server automatically once a federated share was created successfully" : "Afegir servidor automàticament quan s'hagi creat una federació correctament", - "Trusted servers" : "Servidor de confiança", "+ Add trusted server" : "+Afegir servidor de confiança", "Trusted server" : "Servidor de confiança", - "Add" : "Afegir" + "Add" : "Afegir", + "Federation" : "Federació" },"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 03aab40a8aa..34190bbe010 100644 --- a/apps/federation/l10n/cs.js +++ b/apps/federation/l10n/cs.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Server je již přidán na seznam důvěryhodných serverů.", "No server to federate with found" : "Nenalezen žádný server ke sdružování", "Could not add server" : "Nepodařilo se přidat server", - "Federation" : "Sdružování", + "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." : "Sdružování vám umožňuje se připojit k dalším důvěryhodným serverům za účelem výměny uživatelských adresářů. Používá se to např. pro automatické doplňování uživatelů při sdruženém sdílení.", "Add server automatically once a federated share was created successfully" : "Přidat server automaticky jakmile je úspěšně vytvořeno sdružené sdílení", - "Trusted servers" : "Důvěryhodné servery", "+ Add trusted server" : "+ Přidat důvěryhodný server", "Trusted server" : "Důvěryhodný server", - "Add" : "Přidat" + "Add" : "Přidat", + "Federation" : "Sdružování" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/federation/l10n/cs.json b/apps/federation/l10n/cs.json index fd43686079e..05da0723c41 100644 --- a/apps/federation/l10n/cs.json +++ b/apps/federation/l10n/cs.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Server je již přidán na seznam důvěryhodných serverů.", "No server to federate with found" : "Nenalezen žádný server ke sdružování", "Could not add server" : "Nepodařilo se přidat server", - "Federation" : "Sdružování", + "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." : "Sdružování vám umožňuje se připojit k dalším důvěryhodným serverům za účelem výměny uživatelských adresářů. Používá se to např. pro automatické doplňování uživatelů při sdruženém sdílení.", "Add server automatically once a federated share was created successfully" : "Přidat server automaticky jakmile je úspěšně vytvořeno sdružené sdílení", - "Trusted servers" : "Důvěryhodné servery", "+ Add trusted server" : "+ Přidat důvěryhodný server", "Trusted server" : "Důvěryhodný server", - "Add" : "Přidat" + "Add" : "Přidat", + "Federation" : "Sdružování" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/federation/l10n/de.js b/apps/federation/l10n/de.js index fb509f03b93..e286b193091 100644 --- a/apps/federation/l10n/de.js +++ b/apps/federation/l10n/de.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Der Server ist bereits in der Liste der vertrauenswürdigen Server.", "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", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Einen mit ownCloud Federation verbundenen Server automatisch hinzufügen, sobald die Verbindung einmal erfolgreich erstellt wurde", - "Trusted servers" : "Vertrauenswürdige Server", "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen", "Trusted server" : "Vertrauenswürdiger Server", - "Add" : "Hinzufügen" + "Add" : "Hinzufügen", + "Federation" : "Federation" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/de.json b/apps/federation/l10n/de.json index ec9383ff1f7..1ab888f3d2e 100644 --- a/apps/federation/l10n/de.json +++ b/apps/federation/l10n/de.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Der Server ist bereits in der Liste der vertrauenswürdigen Server.", "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", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Einen mit ownCloud Federation verbundenen Server automatisch hinzufügen, sobald die Verbindung einmal erfolgreich erstellt wurde", - "Trusted servers" : "Vertrauenswürdige Server", "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen", "Trusted server" : "Vertrauenswürdiger Server", - "Add" : "Hinzufügen" + "Add" : "Hinzufügen", + "Federation" : "Federation" },"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 a096202a05f..21e394f726a 100644 --- a/apps/federation/l10n/de_DE.js +++ b/apps/federation/l10n/de_DE.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Server ist bereits in der Liste der vertrauenswürdigen Servern.", "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", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobald eine federated Freigabe erstellt wurde", - "Trusted servers" : "Vertrauenswürdige Server", "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen", "Trusted server" : "Vertrauenswürdiger Server", - "Add" : "Hinzufügen" + "Add" : "Hinzufügen", + "Federation" : "Federation" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/de_DE.json b/apps/federation/l10n/de_DE.json index c5215151889..9e0212f5c23 100644 --- a/apps/federation/l10n/de_DE.json +++ b/apps/federation/l10n/de_DE.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Server ist bereits in der Liste der vertrauenswürdigen Servern.", "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", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobald eine federated Freigabe erstellt wurde", - "Trusted servers" : "Vertrauenswürdige Server", "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen", "Trusted server" : "Vertrauenswürdiger Server", - "Add" : "Hinzufügen" + "Add" : "Hinzufügen", + "Federation" : "Federation" },"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 895039f5f78..02680613d43 100644 --- a/apps/federation/l10n/el.js +++ b/apps/federation/l10n/el.js @@ -5,10 +5,10 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Ο διακομιστής περιλαμβάνεται ήδη στην λίστα των έμπιστων ownCloud", "No server to federate with found" : "Δεν βρέθηκε διακομιστής για συνένωση", "Could not add server" : "Αδυναμία προσθήκης διακομιστή", - "Federation" : "Federation", "Trusted servers" : "Έμπιστοι διακομιστές", "+ Add trusted server" : "+Προσθήκη έμπιστων διακομιστών", "Trusted server" : "Έμπιστοι διακομιστές", - "Add" : "Προσθήκη" + "Add" : "Προσθήκη", + "Federation" : "Federation" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/el.json b/apps/federation/l10n/el.json index fe2050d1b15..f6ff9759777 100644 --- a/apps/federation/l10n/el.json +++ b/apps/federation/l10n/el.json @@ -3,10 +3,10 @@ "Server is already in the list of trusted servers." : "Ο διακομιστής περιλαμβάνεται ήδη στην λίστα των έμπιστων ownCloud", "No server to federate with found" : "Δεν βρέθηκε διακομιστής για συνένωση", "Could not add server" : "Αδυναμία προσθήκης διακομιστή", - "Federation" : "Federation", "Trusted servers" : "Έμπιστοι διακομιστές", "+ Add trusted server" : "+Προσθήκη έμπιστων διακομιστών", "Trusted server" : "Έμπιστοι διακομιστές", - "Add" : "Προσθήκη" + "Add" : "Προσθήκη", + "Federation" : "Federation" },"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 ea0b7f165c2..dd81ea6e385 100644 --- a/apps/federation/l10n/es.js +++ b/apps/federation/l10n/es.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.", "No server to federate with found" : "No se ha encontrado ningún servidor con el que federarse.", "Could not add server" : "No se ha podido añadir el servidor", - "Federation" : "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." : "La federación te permite conectarte con otros servidores de confianza para intercambiar directorios. Por ejemplo, ésto se usará para autocompletar la selección usuarios externos al compartir en federación. ", "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", - "Trusted servers" : "Servidores de confianza", "+ Add trusted server" : "+ Añadir servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Añadir" + "Add" : "Añadir", + "Federation" : "Federación" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es.json b/apps/federation/l10n/es.json index dd088e526b8..ddd5791586b 100644 --- a/apps/federation/l10n/es.json +++ b/apps/federation/l10n/es.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.", "No server to federate with found" : "No se ha encontrado ningún servidor con el que federarse.", "Could not add server" : "No se ha podido añadir el servidor", - "Federation" : "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." : "La federación te permite conectarte con otros servidores de confianza para intercambiar directorios. Por ejemplo, ésto se usará para autocompletar la selección usuarios externos al compartir en federación. ", "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", - "Trusted servers" : "Servidores de confianza", "+ Add trusted server" : "+ Añadir servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Añadir" + "Add" : "Añadir", + "Federation" : "Federación" },"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 d14f9937f73..fa327fc7f10 100644 --- a/apps/federation/l10n/es_MX.js +++ b/apps/federation/l10n/es_MX.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "El servidor ya se encuentra en la lista de servidores de confianza.", "No server to federate with found" : "No se encontraron servidores para integrar a la federación", "Could not add server" : "No fue posible agregar el servidor", - "Federation" : "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." : "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.", "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", - "Trusted servers" : "Servidores de confianza", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Federation" : "Federación" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/es_MX.json b/apps/federation/l10n/es_MX.json index 386e85dcffd..d484a9e5897 100644 --- a/apps/federation/l10n/es_MX.json +++ b/apps/federation/l10n/es_MX.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "El servidor ya se encuentra en la lista de servidores de confianza.", "No server to federate with found" : "No se encontraron servidores para integrar a la federación", "Could not add server" : "No fue posible agregar el servidor", - "Federation" : "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." : "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.", "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", - "Trusted servers" : "Servidores de confianza", "+ Add trusted server" : "+ Agregar servidor de confianza", "Trusted server" : "Servidor de confianza", - "Add" : "Agregar" + "Add" : "Agregar", + "Federation" : "Federación" },"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 444c3ac63ed..3eb39aa5004 100644 --- a/apps/federation/l10n/fi.js +++ b/apps/federation/l10n/fi.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Palvelin on jo luotettujen palvelimien luettelossa.", "No server to federate with found" : "Palvelinta, johon liittyä, ei löytynyt", "Could not add server" : "Palvelimen lisääminen ei onnistunut", - "Federation" : "Federaatio", + "Trusted servers" : "Luotetut palvelimet", "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äluetteloihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.", "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti", - "Trusted servers" : "Luotetut palvelimet", "+ Add trusted server" : "+ Lisää luotettu palvelin", "Trusted server" : "Luotettu palvelin", - "Add" : "Lisää" + "Add" : "Lisää", + "Federation" : "Federaatio" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/fi.json b/apps/federation/l10n/fi.json index f7b3263c50b..367fb5fe1b3 100644 --- a/apps/federation/l10n/fi.json +++ b/apps/federation/l10n/fi.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Palvelin on jo luotettujen palvelimien luettelossa.", "No server to federate with found" : "Palvelinta, johon liittyä, ei löytynyt", "Could not add server" : "Palvelimen lisääminen ei onnistunut", - "Federation" : "Federaatio", + "Trusted servers" : "Luotetut palvelimet", "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äluetteloihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.", "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti", - "Trusted servers" : "Luotetut palvelimet", "+ Add trusted server" : "+ Lisää luotettu palvelin", "Trusted server" : "Luotettu palvelin", - "Add" : "Lisää" + "Add" : "Lisää", + "Federation" : "Federaatio" },"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 2ebaaebed06..d67862f6a01 100644 --- a/apps/federation/l10n/fr.js +++ b/apps/federation/l10n/fr.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Le serveur est déjà dans la liste des serveurs de confiance.", "No server to federate with found" : "Aucun serveur avec lequel fédérer n'a été trouvé", "Could not add server" : "Impossible d'ajouter le serveur", - "Federation" : "Fédération", + "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." : "La « 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é.", "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", - "Trusted servers" : "Serveurs de confiance", "+ Add trusted server" : "+ Ajouter un serveur de confiance", "Trusted server" : "Serveur de confiance", - "Add" : "Ajouter" + "Add" : "Ajouter", + "Federation" : "Fédération" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/fr.json b/apps/federation/l10n/fr.json index 7110cb9fe87..24dc0aee7f6 100644 --- a/apps/federation/l10n/fr.json +++ b/apps/federation/l10n/fr.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Le serveur est déjà dans la liste des serveurs de confiance.", "No server to federate with found" : "Aucun serveur avec lequel fédérer n'a été trouvé", "Could not add server" : "Impossible d'ajouter le serveur", - "Federation" : "Fédération", + "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." : "La « 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é.", "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", - "Trusted servers" : "Serveurs de confiance", "+ Add trusted server" : "+ Ajouter un serveur de confiance", "Trusted server" : "Serveur de confiance", - "Add" : "Ajouter" + "Add" : "Ajouter", + "Federation" : "Fédération" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/hu.js b/apps/federation/l10n/hu.js index 53ed9652edd..06f9679fc24 100644 --- a/apps/federation/l10n/hu.js +++ b/apps/federation/l10n/hu.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "A szerver már a megbízható szerverek közt van.", "No server to federate with found" : "Nem található egyesíthető szerver", "Could not add server" : "Nem lehet hozzáadni a szervert", - "Federation" : "Egyesítés", + "Trusted servers" : "Megbízható szerverek", "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." : "Az egyesítés lehetővé teszi a kapcsolódást más megbízható szerverekhez a felhasználói könyvtárak kicseréléséhez. Például ennek segítségével lesznek automatikusan kiegészítve a külső felhasználók az egyesített megosztáshoz.", "Add server automatically once a federated share was created successfully" : "Szerver automatikus hozzáadása, ha az egyesített megosztás létrehozása sikeres", - "Trusted servers" : "Megbízható szerverek", "+ Add trusted server" : "+ Megbízható szerver hozzáadása", "Trusted server" : "Megbízható szerver", - "Add" : "Hozzáadás" + "Add" : "Hozzáadás", + "Federation" : "Egyesítés" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/hu.json b/apps/federation/l10n/hu.json index d7ff0199763..af24f197c19 100644 --- a/apps/federation/l10n/hu.json +++ b/apps/federation/l10n/hu.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "A szerver már a megbízható szerverek közt van.", "No server to federate with found" : "Nem található egyesíthető szerver", "Could not add server" : "Nem lehet hozzáadni a szervert", - "Federation" : "Egyesítés", + "Trusted servers" : "Megbízható szerverek", "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." : "Az egyesítés lehetővé teszi a kapcsolódást más megbízható szerverekhez a felhasználói könyvtárak kicseréléséhez. Például ennek segítségével lesznek automatikusan kiegészítve a külső felhasználók az egyesített megosztáshoz.", "Add server automatically once a federated share was created successfully" : "Szerver automatikus hozzáadása, ha az egyesített megosztás létrehozása sikeres", - "Trusted servers" : "Megbízható szerverek", "+ Add trusted server" : "+ Megbízható szerver hozzáadása", "Trusted server" : "Megbízható szerver", - "Add" : "Hozzáadás" + "Add" : "Hozzáadás", + "Federation" : "Egyesítés" },"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 1f43df4df83..889d305cb5d 100644 --- a/apps/federation/l10n/ia.js +++ b/apps/federation/l10n/ia.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Servitor ja es in le lista de servitores fiduciari.", "No server to federate with found" : "Nulle servitor pro associar se per federation esseva trovate", "Could not add server" : "Impossibile adder le servitor", - "Federation" : "Federation", + "Trusted servers" : "Servitores fiduciari", "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.", "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", - "Trusted servers" : "Servitores fiduciari", "+ Add trusted server" : "+ Adder servitor fiduciari", "Trusted server" : "Servitor fiduciari", - "Add" : "Adder" + "Add" : "Adder", + "Federation" : "Federation" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/ia.json b/apps/federation/l10n/ia.json index 1fb0190efb3..5b06ced40ea 100644 --- a/apps/federation/l10n/ia.json +++ b/apps/federation/l10n/ia.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Servitor ja es in le lista de servitores fiduciari.", "No server to federate with found" : "Nulle servitor pro associar se per federation esseva trovate", "Could not add server" : "Impossibile adder le servitor", - "Federation" : "Federation", + "Trusted servers" : "Servitores fiduciari", "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.", "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", - "Trusted servers" : "Servitores fiduciari", "+ Add trusted server" : "+ Adder servitor fiduciari", "Trusted server" : "Servitor fiduciari", - "Add" : "Adder" + "Add" : "Adder", + "Federation" : "Federation" },"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 6c98d2f83df..2e7137bc995 100644 --- a/apps/federation/l10n/id.js +++ b/apps/federation/l10n/id.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Server sudah ada pada daftar server terpercaya", "No server to federate with found" : "Tidak ada server yang bisa difederasikan", "Could not add server" : "Tidak dapat menambahkan server", - "Federation" : "Federasi", + "Trusted servers" : "Server terpercaya", "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.", "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat", - "Trusted servers" : "Server terpercaya", "+ Add trusted server" : "+ Tambah server terpercaya", "Trusted server" : "Server terpercaya", - "Add" : "Tambah" + "Add" : "Tambah", + "Federation" : "Federasi" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/id.json b/apps/federation/l10n/id.json index 1757ce4b1dc..835481d081c 100644 --- a/apps/federation/l10n/id.json +++ b/apps/federation/l10n/id.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Server sudah ada pada daftar server terpercaya", "No server to federate with found" : "Tidak ada server yang bisa difederasikan", "Could not add server" : "Tidak dapat menambahkan server", - "Federation" : "Federasi", + "Trusted servers" : "Server terpercaya", "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.", "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat", - "Trusted servers" : "Server terpercaya", "+ Add trusted server" : "+ Tambah server terpercaya", "Trusted server" : "Server terpercaya", - "Add" : "Tambah" + "Add" : "Tambah", + "Federation" : "Federasi" },"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 a2fb6474ecc..0261141a59c 100644 --- a/apps/federation/l10n/is.js +++ b/apps/federation/l10n/is.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Þjónninn er nú þegar á listanum yfir treysta þjóna.", "No server to federate with found" : "Enginn þjónn sem hæfur er til skýjasambands fannst", "Could not add server" : "Gat ekki bætt við þjóni", - "Federation" : "Samband", + "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." : "Þ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.", "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign", - "Trusted servers" : "Treystir þjónar", "+ Add trusted server" : "+ Bæta við treystum þjóni", "Trusted server" : "Treystur þjónn", - "Add" : "Bæta við" + "Add" : "Bæta við", + "Federation" : "Samband" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/federation/l10n/is.json b/apps/federation/l10n/is.json index 4d6979b9ba9..cd851a5bb90 100644 --- a/apps/federation/l10n/is.json +++ b/apps/federation/l10n/is.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Þjónninn er nú þegar á listanum yfir treysta þjóna.", "No server to federate with found" : "Enginn þjónn sem hæfur er til skýjasambands fannst", "Could not add server" : "Gat ekki bætt við þjóni", - "Federation" : "Samband", + "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." : "Þ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.", "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign", - "Trusted servers" : "Treystir þjónar", "+ Add trusted server" : "+ Bæta við treystum þjóni", "Trusted server" : "Treystur þjónn", - "Add" : "Bæta við" + "Add" : "Bæta við", + "Federation" : "Samband" },"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 b83315d5438..a18901ee4e5 100644 --- a/apps/federation/l10n/it.js +++ b/apps/federation/l10n/it.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Il server è già nell'elenco dei server affidabili.", "No server to federate with found" : "Non ho trovato alcun server per la federazione", "Could not add server" : "Impossibile aggiungere il server", - "Federation" : "Federazione", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Aggiungi automaticamente il server dopo che una condivisione federata è stata creata con successo", - "Trusted servers" : "Server affidabili", "+ Add trusted server" : "+ Aggiungi server affidabile", "Trusted server" : "Server affidabile", - "Add" : "Aggiungi" + "Add" : "Aggiungi", + "Federation" : "Federazione" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/it.json b/apps/federation/l10n/it.json index 886b2fce210..9d732b0f5ac 100644 --- a/apps/federation/l10n/it.json +++ b/apps/federation/l10n/it.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Il server è già nell'elenco dei server affidabili.", "No server to federate with found" : "Non ho trovato alcun server per la federazione", "Could not add server" : "Impossibile aggiungere il server", - "Federation" : "Federazione", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Aggiungi automaticamente il server dopo che una condivisione federata è stata creata con successo", - "Trusted servers" : "Server affidabili", "+ Add trusted server" : "+ Aggiungi server affidabile", "Trusted server" : "Server affidabile", - "Add" : "Aggiungi" + "Add" : "Aggiungi", + "Federation" : "Federazione" },"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 c0e6512e137..6f8a9ee096c 100644 --- a/apps/federation/l10n/ja.js +++ b/apps/federation/l10n/ja.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "信頼済サーバーとして既に登録されています。", "No server to federate with found" : "Nextcloud 連携サーバーはありません。", "Could not add server" : "サーバーを追加できませんでした", - "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." : "連携では他の信頼済サーバーとユーザーリストをやり取りすること許可します。例えば、連携共有時で他のサーバーのユーザーのIDを自動補完します。", "Add server automatically once a federated share was created successfully" : "追加するサーバは自動的に統合され、共有が追加されました", - "Trusted servers" : "信頼済サーバー", "+ Add trusted server" : "+ 信頼済サーバーに追加", "Trusted server" : "信頼済サーバー", - "Add" : "追加" + "Add" : "追加", + "Federation" : "連携" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/ja.json b/apps/federation/l10n/ja.json index 4519b04eeed..53147709788 100644 --- a/apps/federation/l10n/ja.json +++ b/apps/federation/l10n/ja.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "信頼済サーバーとして既に登録されています。", "No server to federate with found" : "Nextcloud 連携サーバーはありません。", "Could not add server" : "サーバーを追加できませんでした", - "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." : "連携では他の信頼済サーバーとユーザーリストをやり取りすること許可します。例えば、連携共有時で他のサーバーのユーザーのIDを自動補完します。", "Add server automatically once a federated share was created successfully" : "追加するサーバは自動的に統合され、共有が追加されました", - "Trusted servers" : "信頼済サーバー", "+ Add trusted server" : "+ 信頼済サーバーに追加", "Trusted server" : "信頼済サーバー", - "Add" : "追加" + "Add" : "追加", + "Federation" : "連携" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/l10n/lv.js b/apps/federation/l10n/lv.js index dab4eb4774b..2d6c51ceb79 100644 --- a/apps/federation/l10n/lv.js +++ b/apps/federation/l10n/lv.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Serveris jau ir uzticamo serveru sarakstā .", "No server to federate with found" : "Nav atrasts neviens serveris", "Could not add server" : "Nevarēja pievienot serveri", - "Federation" : "Federācija", + "Trusted servers" : "Uzticami serveri", "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.", "Add server automatically once a federated share was created successfully" : "Automātiski pievienots serveris federācijas koplietojumam, veiksmīgi", - "Trusted servers" : "Uzticami serveri", "+ Add trusted server" : "+ pievietot uzticamiem serveriem", "Trusted server" : "Uzticams serveris", - "Add" : "Pievienot" + "Add" : "Pievienot", + "Federation" : "Federācija" }, "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 ecbb8c9303c..ce6716fb58c 100644 --- a/apps/federation/l10n/lv.json +++ b/apps/federation/l10n/lv.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Serveris jau ir uzticamo serveru sarakstā .", "No server to federate with found" : "Nav atrasts neviens serveris", "Could not add server" : "Nevarēja pievienot serveri", - "Federation" : "Federācija", + "Trusted servers" : "Uzticami serveri", "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.", "Add server automatically once a federated share was created successfully" : "Automātiski pievienots serveris federācijas koplietojumam, veiksmīgi", - "Trusted servers" : "Uzticami serveri", "+ Add trusted server" : "+ pievietot uzticamiem serveriem", "Trusted server" : "Uzticams serveris", - "Add" : "Pievienot" + "Add" : "Pievienot", + "Federation" : "Federācija" },"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/nb.js b/apps/federation/l10n/nb.js index 673ea35b659..d64c4e1b1f2 100644 --- a/apps/federation/l10n/nb.js +++ b/apps/federation/l10n/nb.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Tjeneren er allerede i listen av klarerte tjenere.", "No server to federate with found" : "Ingen tjener å forene med ble funnet", "Could not add server" : "Kunne ikke legge til tjener", - "Federation" : "Sammenknytting", + "Trusted servers" : "Klarerte tjenere", "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." : "Føderasjon tillater deg å koble sammen andre betrodde tjenere for utviksling av bruker kataloger. For eksempel vil det bli brukt for autofullføring av eksterne brukere for føderal deling.", "Add server automatically once a federated share was created successfully" : "Legg til tjener automatisk når en sammenknyttet deling er blitt opprettet", - "Trusted servers" : "Klarerte tjenere", "+ Add trusted server" : "+ Legg til klarert tjener", "Trusted server" : "Klarert tjener", - "Add" : "Legg til" + "Add" : "Legg til", + "Federation" : "Sammenknytting" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/nb.json b/apps/federation/l10n/nb.json index f93121147d1..4fd448becf5 100644 --- a/apps/federation/l10n/nb.json +++ b/apps/federation/l10n/nb.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Tjeneren er allerede i listen av klarerte tjenere.", "No server to federate with found" : "Ingen tjener å forene med ble funnet", "Could not add server" : "Kunne ikke legge til tjener", - "Federation" : "Sammenknytting", + "Trusted servers" : "Klarerte tjenere", "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." : "Føderasjon tillater deg å koble sammen andre betrodde tjenere for utviksling av bruker kataloger. For eksempel vil det bli brukt for autofullføring av eksterne brukere for føderal deling.", "Add server automatically once a federated share was created successfully" : "Legg til tjener automatisk når en sammenknyttet deling er blitt opprettet", - "Trusted servers" : "Klarerte tjenere", "+ Add trusted server" : "+ Legg til klarert tjener", "Trusted server" : "Klarert tjener", - "Add" : "Legg til" + "Add" : "Legg til", + "Federation" : "Sammenknytting" },"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 dd1ae5fb4ab..7dc7d94ba67 100644 --- a/apps/federation/l10n/nl.js +++ b/apps/federation/l10n/nl.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Server bestaat reeds in de lijst van vertrouwde servers.", "No server to federate with found" : "Geen server gevonden om mee te federeren", "Could not add server" : "Kon server niet toevoegen", - "Federation" : "Federatie", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is", - "Trusted servers" : "Vertrouwde servers", "+ Add trusted server" : "+ Toevoegen vertrouwde server", "Trusted server" : "Vertrouwde server", - "Add" : "Toevoegen" + "Add" : "Toevoegen", + "Federation" : "Federatie" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/nl.json b/apps/federation/l10n/nl.json index 1978c30e909..898142b497e 100644 --- a/apps/federation/l10n/nl.json +++ b/apps/federation/l10n/nl.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Server bestaat reeds in de lijst van vertrouwde servers.", "No server to federate with found" : "Geen server gevonden om mee te federeren", "Could not add server" : "Kon server niet toevoegen", - "Federation" : "Federatie", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is", - "Trusted servers" : "Vertrouwde servers", "+ Add trusted server" : "+ Toevoegen vertrouwde server", "Trusted server" : "Vertrouwde server", - "Add" : "Toevoegen" + "Add" : "Toevoegen", + "Federation" : "Federatie" },"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 cc83a658919..a82f5663280 100644 --- a/apps/federation/l10n/pl.js +++ b/apps/federation/l10n/pl.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Serwer znajduje się już na liście zaufanych serwerów.", "No server to federate with found" : "Nie znaleziono stowarzyszonego serwera", "Could not add server" : "Nie można dodać serwera", - "Federation" : "Stowarzyszenia", + "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." : "Stowarzyszenie pozwala łączyć się z innymi zaufanymi użytkownikami i wymieniać się z nimi katalogami. Na przykład, może to być wykorzystane do autouzupełniania w dzieleniu się ze stowarzyszonym użytkownikiem.", "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu stowarzyszonego udziału.", - "Trusted servers" : "Zaufane serwery", "+ Add trusted server" : "+ Dodaj zaufany serwer", "Trusted server" : "Zaufany serwer", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Federation" : "Stowarzyszenia" }, "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 f6a3f6c57ce..4221b99c470 100644 --- a/apps/federation/l10n/pl.json +++ b/apps/federation/l10n/pl.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Serwer znajduje się już na liście zaufanych serwerów.", "No server to federate with found" : "Nie znaleziono stowarzyszonego serwera", "Could not add server" : "Nie można dodać serwera", - "Federation" : "Stowarzyszenia", + "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." : "Stowarzyszenie pozwala łączyć się z innymi zaufanymi użytkownikami i wymieniać się z nimi katalogami. Na przykład, może to być wykorzystane do autouzupełniania w dzieleniu się ze stowarzyszonym użytkownikiem.", "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu stowarzyszonego udziału.", - "Trusted servers" : "Zaufane serwery", "+ Add trusted server" : "+ Dodaj zaufany serwer", "Trusted server" : "Zaufany serwer", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Federation" : "Stowarzyszenia" },"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 7550880d368..dc358d66c34 100644 --- a/apps/federation/l10n/pt_BR.js +++ b/apps/federation/l10n/pt_BR.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "O servidor já está na lista de servidores confiáveis.", "No server to federate with found" : "Nenhum servidor encontrado para federar", "Could not add server" : "Não foi possível adicionar servidor", - "Federation" : "Federação", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento federado foi criado com êxito", - "Trusted servers" : "Servidores confiáveis", "+ Add trusted server" : "+Adicionar servidores confiáveis", "Trusted server" : "Servidores confiáveis", - "Add" : "Adicionar" + "Add" : "Adicionar", + "Federation" : "Federação" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/pt_BR.json b/apps/federation/l10n/pt_BR.json index c44d3949602..d9f1ef6147b 100644 --- a/apps/federation/l10n/pt_BR.json +++ b/apps/federation/l10n/pt_BR.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "O servidor já está na lista de servidores confiáveis.", "No server to federate with found" : "Nenhum servidor encontrado para federar", "Could not add server" : "Não foi possível adicionar servidor", - "Federation" : "Federação", + "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." : "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.", "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento federado foi criado com êxito", - "Trusted servers" : "Servidores confiáveis", "+ Add trusted server" : "+Adicionar servidores confiáveis", "Trusted server" : "Servidores confiáveis", - "Add" : "Adicionar" + "Add" : "Adicionar", + "Federation" : "Federação" },"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 dbd4a572e2a..5e3c36f176a 100644 --- a/apps/federation/l10n/ru.js +++ b/apps/federation/l10n/ru.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Сервер уже есть в списке доверенных серверов.", "No server to federate with found" : "Сервер для объединения не найден", "Could not add server" : "Не удалось добавить сервер", - "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." : "Федерация серверов позволит Вам подключиться к другим доверенным серверам для обмена каталогами пользователей. Это будет использовано, например, для автодополнения имён пользователей при открытии федеративного общего доступа.", "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически после успешного создания федеративного ресурса общего доступа", - "Trusted servers" : "Доверенные серверы", "+ Add trusted server" : "+ Добавить доверенный сервер", "Trusted server" : "Доверенный сервер", - "Add" : "Добавить" + "Add" : "Добавить", + "Federation" : "Федерация" }, "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 a0d30c5b965..cf988061685 100644 --- a/apps/federation/l10n/ru.json +++ b/apps/federation/l10n/ru.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Сервер уже есть в списке доверенных серверов.", "No server to federate with found" : "Сервер для объединения не найден", "Could not add server" : "Не удалось добавить сервер", - "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." : "Федерация серверов позволит Вам подключиться к другим доверенным серверам для обмена каталогами пользователей. Это будет использовано, например, для автодополнения имён пользователей при открытии федеративного общего доступа.", "Add server automatically once a federated share was created successfully" : "Добавить сервер автоматически после успешного создания федеративного ресурса общего доступа", - "Trusted servers" : "Доверенные серверы", "+ Add trusted server" : "+ Добавить доверенный сервер", "Trusted server" : "Доверенный сервер", - "Add" : "Добавить" + "Add" : "Добавить", + "Federation" : "Федерация" },"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/sl.js b/apps/federation/l10n/sl.js index c020bc2fa51..c89639b505e 100644 --- a/apps/federation/l10n/sl.js +++ b/apps/federation/l10n/sl.js @@ -4,12 +4,12 @@ OC.L10N.register( "Added to the list of trusted servers" : "Dodano na spisek varnih strežnikov", "Server is already in the list of trusted servers." : "Strežnik je že na seznamu potrjenih strežnikov.", "Could not add server" : "Ni mogoče dodati strežnika.", - "Federation" : "Zvezni oblaki", + "Trusted servers" : "Zanesljivi 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." : "Federiranje omogoča povezovanje z drugimi varnimi strežniki in izmenjavo spiska uporabnikov. Primer je samodejno dopolnjevanje zunanjih uporabnikov pri federacijski souporabi.", "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, ko je povezava zveznega oblaka uspešno ustvarjena", - "Trusted servers" : "Zanesljivi strežniki", "+ Add trusted server" : "+ Dodaj zanesljiv strežnik", "Trusted server" : "Zanesljiv strežnik", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Federation" : "Zvezni oblaki" }, "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 f8c696a6f52..3c3ee449df0 100644 --- a/apps/federation/l10n/sl.json +++ b/apps/federation/l10n/sl.json @@ -2,12 +2,12 @@ "Added to the list of trusted servers" : "Dodano na spisek varnih strežnikov", "Server is already in the list of trusted servers." : "Strežnik je že na seznamu potrjenih strežnikov.", "Could not add server" : "Ni mogoče dodati strežnika.", - "Federation" : "Zvezni oblaki", + "Trusted servers" : "Zanesljivi 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." : "Federiranje omogoča povezovanje z drugimi varnimi strežniki in izmenjavo spiska uporabnikov. Primer je samodejno dopolnjevanje zunanjih uporabnikov pri federacijski souporabi.", "Add server automatically once a federated share was created successfully" : "Strežnik dodaj samodejno, ko je povezava zveznega oblaka uspešno ustvarjena", - "Trusted servers" : "Zanesljivi strežniki", "+ Add trusted server" : "+ Dodaj zanesljiv strežnik", "Trusted server" : "Zanesljiv strežnik", - "Add" : "Dodaj" + "Add" : "Dodaj", + "Federation" : "Zvezni oblaki" },"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 33e5817f631..dc4aeb8b7f7 100644 --- a/apps/federation/l10n/sq.js +++ b/apps/federation/l10n/sq.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Server-i është tashmë në listën e server-ave të besuar.", "No server to federate with found" : "Nuk u gjet server me të cilin mund të federohej", "Could not add server" : "Server-i s’u shtua dot", - "Federation" : "Federim", + "Trusted servers" : "Servera të besuar", "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.", "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu server-in pasi të jetë krijuar me sukses një ndarje e federuar", - "Trusted servers" : "Servera të besuar", "+ Add trusted server" : "+ Shto server-a të besuar", "Trusted server" : "Server i besuar", - "Add" : "Shto" + "Add" : "Shto", + "Federation" : "Federim" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/sq.json b/apps/federation/l10n/sq.json index fa3dfacd4d7..5ed93828d67 100644 --- a/apps/federation/l10n/sq.json +++ b/apps/federation/l10n/sq.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Server-i është tashmë në listën e server-ave të besuar.", "No server to federate with found" : "Nuk u gjet server me të cilin mund të federohej", "Could not add server" : "Server-i s’u shtua dot", - "Federation" : "Federim", + "Trusted servers" : "Servera të besuar", "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.", "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu server-in pasi të jetë krijuar me sukses një ndarje e federuar", - "Trusted servers" : "Servera të besuar", "+ Add trusted server" : "+ Shto server-a të besuar", "Trusted server" : "Server i besuar", - "Add" : "Shto" + "Add" : "Shto", + "Federation" : "Federim" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/sv.js b/apps/federation/l10n/sv.js index 109a0cac20b..fa6ccf86dc9 100644 --- a/apps/federation/l10n/sv.js +++ b/apps/federation/l10n/sv.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Servern finns redan i listan", "No server to federate with found" : "Ingen server att federera med hittades", "Could not add server" : "Kunde inte lägga till server", - "Federation" : "Federerad delning", + "Trusted servers" : "Betrodda servrar", "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.", "Add server automatically once a federated share was created successfully" : "Lägg till servern automatiskt så fort en lyckad federerad delning skapats", - "Trusted servers" : "Betrodda servrar", "+ Add trusted server" : "+ Lägg till betrodd server", "Trusted server" : "Betrodd server", - "Add" : "Lägg till" + "Add" : "Lägg till", + "Federation" : "Federerad delning" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/sv.json b/apps/federation/l10n/sv.json index 8cfdb3213cd..ead6b203f7f 100644 --- a/apps/federation/l10n/sv.json +++ b/apps/federation/l10n/sv.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Servern finns redan i listan", "No server to federate with found" : "Ingen server att federera med hittades", "Could not add server" : "Kunde inte lägga till server", - "Federation" : "Federerad delning", + "Trusted servers" : "Betrodda servrar", "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.", "Add server automatically once a federated share was created successfully" : "Lägg till servern automatiskt så fort en lyckad federerad delning skapats", - "Trusted servers" : "Betrodda servrar", "+ Add trusted server" : "+ Lägg till betrodd server", "Trusted server" : "Betrodd server", - "Add" : "Lägg till" + "Add" : "Lägg till", + "Federation" : "Federerad delning" },"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 d66974eec5b..dd959026d0f 100644 --- a/apps/federation/l10n/tr.js +++ b/apps/federation/l10n/tr.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "Sunucu zaten güvenilen sunucu listesine eklenmiş.", "No server to federate with found" : "Birleştirilecek bir sunucu bulunamadı", "Could not add server" : "Sunucu eklenemedi", - "Federation" : "Birleşim", + "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." : "Birleşim, diğer güvenilir sunucularla dosya/klasör paylaşımı yapılmasını sağlar. Örneğin, bu işlem birleştirilmiş paylaşım için dış kullanıcıların otomatik olarak tamamlanmasını sağlar.", "Add server automatically once a federated share was created successfully" : "Bir birleşmiş paylaşım eklendiğinde sunucu otomatik olarak eklensin", - "Trusted servers" : "Güvenilen sunucular", "+ Add trusted server" : "+ Güvenilir sunucu ekle", "Trusted server" : "Güvenilen sunucu", - "Add" : "Ekle" + "Add" : "Ekle", + "Federation" : "Birleşim" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/tr.json b/apps/federation/l10n/tr.json index 797b0dd0b83..eb7971df9bb 100644 --- a/apps/federation/l10n/tr.json +++ b/apps/federation/l10n/tr.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "Sunucu zaten güvenilen sunucu listesine eklenmiş.", "No server to federate with found" : "Birleştirilecek bir sunucu bulunamadı", "Could not add server" : "Sunucu eklenemedi", - "Federation" : "Birleşim", + "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." : "Birleşim, diğer güvenilir sunucularla dosya/klasör paylaşımı yapılmasını sağlar. Örneğin, bu işlem birleştirilmiş paylaşım için dış kullanıcıların otomatik olarak tamamlanmasını sağlar.", "Add server automatically once a federated share was created successfully" : "Bir birleşmiş paylaşım eklendiğinde sunucu otomatik olarak eklensin", - "Trusted servers" : "Güvenilen sunucular", "+ Add trusted server" : "+ Güvenilir sunucu ekle", "Trusted server" : "Güvenilen sunucu", - "Add" : "Ekle" + "Add" : "Ekle", + "Federation" : "Birleşim" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/zh_CN.js b/apps/federation/l10n/zh_CN.js index d3753188afc..bb30e2cb86d 100644 --- a/apps/federation/l10n/zh_CN.js +++ b/apps/federation/l10n/zh_CN.js @@ -5,12 +5,12 @@ OC.L10N.register( "Server is already in the list of trusted servers." : "服务器在线，并已成功添加至信任服务器列表。", "No server to federate with found" : "没有找到联盟服务器", "Could not add server" : "无法添加服务器", - "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." : "联盟允许您与其他受信任的服务器连接并交换用户目录。 例如，这将用于自动完成外部用户组成共享联盟。", "Add server automatically once a federated share was created successfully" : "一旦联合共享创建成功自动添加服务器", - "Trusted servers" : "可信任服务器", "+ Add trusted server" : "+ 添加可信任服务器", "Trusted server" : "可信任服务器", - "Add" : "添加" + "Add" : "添加", + "Federation" : "联合" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/zh_CN.json b/apps/federation/l10n/zh_CN.json index 3c6a518a59c..919c572ba34 100644 --- a/apps/federation/l10n/zh_CN.json +++ b/apps/federation/l10n/zh_CN.json @@ -3,12 +3,12 @@ "Server is already in the list of trusted servers." : "服务器在线，并已成功添加至信任服务器列表。", "No server to federate with found" : "没有找到联盟服务器", "Could not add server" : "无法添加服务器", - "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." : "联盟允许您与其他受信任的服务器连接并交换用户目录。 例如，这将用于自动完成外部用户组成共享联盟。", "Add server automatically once a federated share was created successfully" : "一旦联合共享创建成功自动添加服务器", - "Trusted servers" : "可信任服务器", "+ Add trusted server" : "+ 添加可信任服务器", "Trusted server" : "可信任服务器", - "Add" : "添加" + "Add" : "添加", + "Federation" : "联合" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 0fcb10a21ee..6b5b5a2daef 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -327,6 +327,7 @@ this.$fileList.on('click','td.filename>a.name, td.filesize, td.date', _.bind(this._onClickFile, this)); this.$fileList.on('change', 'td.filename>.selectCheckBox', _.bind(this._onClickFileCheckbox, this)); + this.$el.on('show', _.bind(this._onShow, this)); this.$el.on('urlChanged', _.bind(this._onUrlChanged, this)); this.$el.find('.select-all').click(_.bind(this._onClickSelectAll, this)); this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this)); @@ -553,6 +554,13 @@ }, /** + * Event handler when leaving previously hidden state + */ + _onShow: function(e) { + this.reload(); + }, + + /** * Event handler for when the URL changed */ _onUrlChanged: function(e) { diff --git a/apps/files/js/gotoplugin.js b/apps/files/js/gotoplugin.js index 69ec64b0266..4793420ed2d 100644 --- a/apps/files/js/gotoplugin.js +++ b/apps/files/js/gotoplugin.js @@ -40,6 +40,7 @@ type: OCA.Files.FileActions.TYPE_DROPDOWN, actionHandler: function (fileName, context) { var fileModel = context.fileInfoModel; + OC.Apps.hideAppSidebar($('.detailsView')); OCA.Files.App.setActiveView('files', {silent: true}); OCA.Files.App.fileList.changeDirectory(fileModel.get('path'), true, true).then(function() { OCA.Files.App.fileList.scrollTo(fileModel.get('name')); diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js index ed0c1f66f28..7431287a389 100644 --- a/apps/files/l10n/is.js +++ b/apps/files/l10n/is.js @@ -69,6 +69,7 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n bæti","%n bæti"], "Favorited" : "Sett í eftirlæti", "Favorite" : "Eftirlæti", + "Copy direct link (only works for users who have access to this file/folder)" : "Afrita beinan tengil (virkar bara fyrir notendur sem eiga aðgang að þessari skrá/möppu)", "Folder" : "Mappa", "New folder" : "Ný mappa", "Upload" : "Senda inn", @@ -120,6 +121,7 @@ OC.L10N.register( "Select all" : "Velja allt", "Upload too large" : "Innsend skrá er of stór", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.", + "No favorites yet" : "Engin eftirlæti ennþá", "Files and folders you mark as favorite will show up here" : "Skrár og möppur sem þú merkir sem eftirlæti birtast hér", "Shared with you" : "Deilt með þér", "Shared with others" : "Deilt með öðrum", diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json index e96f38480e7..6ef9d3e8656 100644 --- a/apps/files/l10n/is.json +++ b/apps/files/l10n/is.json @@ -67,6 +67,7 @@ "_%n byte_::_%n bytes_" : ["%n bæti","%n bæti"], "Favorited" : "Sett í eftirlæti", "Favorite" : "Eftirlæti", + "Copy direct link (only works for users who have access to this file/folder)" : "Afrita beinan tengil (virkar bara fyrir notendur sem eiga aðgang að þessari skrá/möppu)", "Folder" : "Mappa", "New folder" : "Ný mappa", "Upload" : "Senda inn", @@ -118,6 +119,7 @@ "Select all" : "Velja allt", "Upload too large" : "Innsend skrá er of stór", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.", + "No favorites yet" : "Engin eftirlæti ennþá", "Files and folders you mark as favorite will show up here" : "Skrár og möppur sem þú merkir sem eftirlæti birtast hér", "Shared with you" : "Deilt með þér", "Shared with others" : "Deilt með öðrum", diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index ee73914f166..934aa054fb6 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -1507,6 +1507,12 @@ describe('OCA.Files.FileList tests', function() { $('#app-content-files').trigger(new $.Event('urlChanged', {view: 'files', dir: '/somedir'})); expect(fileList.getCurrentDirectory()).toEqual('/somedir'); }); + it('reloads the list when leaving hidden state', function() { + var reloadStub = sinon.stub(fileList, 'reload'); + $('#app-content-files').trigger(new $.Event('show')); + expect(reloadStub.calledOnce).toEqual(true); + reloadStub.restore(); + }); it('refreshes breadcrumb after update', function() { var setDirSpy = sinon.spy(fileList.breadcrumb, 'setDirectory'); fileList.changeDirectory('/anothersubdir'); diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index 925596198cf..ddf609129f6 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -44,7 +44,7 @@ $appContainer = \OC_Mount_Config::$app->getContainer(); 'appname' => 'files_external', 'script' => 'list.php', 'order' => 30, - 'name' => $l->t('External storage'), + 'name' => $l->t('External storages'), ]; }); diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index 38e497eebe6..610bc2f0e6b 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -1,6 +1,5 @@ #global_credentials { padding: 0 30px; - margin-bottom: 0px; } #files_external { diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js index e492c49d198..2362f0c0326 100644 --- a/apps/files_external/l10n/is.js +++ b/apps/files_external/l10n/is.js @@ -38,6 +38,7 @@ OC.L10N.register( "Credentials saved" : "Auðkenni vistuð", "Credentials saving failed" : "Vistun auðkenna tókst ekki", "Credentials required" : "Auðkenna krafist", + "Storage with ID \"%d\" not found" : "Geymsla með auðkennið '%d' fannst ekki", "Invalid backend or authentication mechanism class" : "Ógildur flokkur bakenda eða auðkenningartækni", "Invalid mount point" : "Ógildur tengipunktur", "Objectstore forbidden" : "Hlutageymsla (objectstore) bönnuð", @@ -48,6 +49,7 @@ OC.L10N.register( "Unsatisfied authentication mechanism parameters" : "Óuppfyllt viðföng auðkenningartækni", "Insufficient data: %s" : "Ónóg gögn: %s", "%s" : "%s", + "Storage with ID \"%d\" is not user editable" : "Geymslan með auðkennið '%d' er ekki breytanleg af notanda", "Access key" : "Aðgangslykill", "Secret key" : "Leynilykill", "Builtin" : "Innbyggt", diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json index d250b3151a1..7d0fcedb985 100644 --- a/apps/files_external/l10n/is.json +++ b/apps/files_external/l10n/is.json @@ -36,6 +36,7 @@ "Credentials saved" : "Auðkenni vistuð", "Credentials saving failed" : "Vistun auðkenna tókst ekki", "Credentials required" : "Auðkenna krafist", + "Storage with ID \"%d\" not found" : "Geymsla með auðkennið '%d' fannst ekki", "Invalid backend or authentication mechanism class" : "Ógildur flokkur bakenda eða auðkenningartækni", "Invalid mount point" : "Ógildur tengipunktur", "Objectstore forbidden" : "Hlutageymsla (objectstore) bönnuð", @@ -46,6 +47,7 @@ "Unsatisfied authentication mechanism parameters" : "Óuppfyllt viðföng auðkenningartækni", "Insufficient data: %s" : "Ónóg gögn: %s", "%s" : "%s", + "Storage with ID \"%d\" is not user editable" : "Geymslan með auðkennið '%d' er ekki breytanleg af notanda", "Access key" : "Aðgangslykill", "Secret key" : "Leynilykill", "Builtin" : "Innbyggt", diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index c40ca07b76b..5cd04ece446 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -189,13 +189,16 @@ // remove icon, if applicable OC.Share.markFileAsShared($tr, false, false); } - var newIcon = $tr.attr('data-icon'); - // in case markFileAsShared decided to change the icon, - // we need to modify the model - // (FIXME: yes, this is hacky) - if (fileInfoModel.get('icon') !== newIcon) { - fileInfoModel.set('icon', newIcon); - } + + // FIXME: this is too convoluted. We need to get rid of the above updates + // and only ever update the model and let the events take care of rerendering + fileInfoModel.set({ + shareTypes: shareModel.getShareTypes(), + // in case markFileAsShared decided to change the icon, + // we need to modify the model + // (FIXME: yes, this is hacky) + icon: $tr.attr('data-icon') + }); }); fileList.registerTabView(shareTab); diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js index 7568b06f27c..ea2f427df75 100644 --- a/apps/files_sharing/tests/js/shareSpec.js +++ b/apps/files_sharing/tests/js/shareSpec.js @@ -470,4 +470,82 @@ describe('OCA.Sharing.Util tests', function() { }); }); + describe('ShareTabView interaction', function() { + var shareTabSpy; + var fileInfoModel; + var configModel; + var shareModel; + + beforeEach(function() { + shareTabSpy = sinon.spy(OCA.Sharing, 'ShareTabView'); + + var attributes = { + itemType: 'file', + itemSource: 123, + possiblePermissions: 31, + permissions: 31 + }; + fileInfoModel = new OCA.Files.FileInfoModel(testFiles[0]); + configModel = new OC.Share.ShareConfigModel({ + enforcePasswordForPublicLink: false, + isResharingAllowed: true, + isDefaultExpireDateEnabled: false, + isDefaultExpireDateEnforced: false, + defaultExpireDate: 7 + }); + shareModel = new OC.Share.ShareItemModel(attributes, { + configModel: configModel, + fileInfoModel: fileInfoModel + }); + + /* jshint camelcase: false */ + shareModel.set({ + reshare: {}, + shares: [{ + id: 100, + item_source: 1, + permissions: 31, + share_type: OC.Share.SHARE_TYPE_USER, + share_with: 'user1', + share_with_displayname: 'User One' + }, { + id: 102, + item_source: 1, + permissions: 31, + share_type: OC.Share.SHARE_TYPE_REMOTE, + share_with: 'foo@bar.com/baz', + share_with_displayname: 'foo@bar.com/baz' + + }] + }, {parse: true}); + + fileList.destroy(); + fileList = new OCA.Files.FileList( + $('#listContainer'), { + id: 'files', + fileActions: new OCA.Files.FileActions() + } + ); + OCA.Sharing.Util.attach(fileList); + fileList.setFiles(testFiles); + }); + afterEach(function() { + shareTabSpy.restore(); + }); + + it('updates fileInfoModel when shares changed', function() { + var changeHandler = sinon.stub(); + fileInfoModel.on('change', changeHandler); + + shareTabSpy.getCall(0).thisValue.trigger('sharesChanged', shareModel); + + expect(changeHandler.calledOnce).toEqual(true); + expect(changeHandler.getCall(0).args[0].changed).toEqual({ + shareTypes: [ + OC.Share.SHARE_TYPE_USER, + OC.Share.SHARE_TYPE_REMOTE + ] + }); + }); + }); }); diff --git a/apps/sharebymail/l10n/de.js b/apps/sharebymail/l10n/de.js index eebd83371c3..ee50fbe21dc 100644 --- a/apps/sharebymail/l10n/de.js +++ b/apps/sharebymail/l10n/de.js @@ -12,10 +12,6 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "Sie teilen {file} mit {email} über E-Mail", "%3$s shared %1$s with %2$s by mail" : "%3$s teilt %1$s mit %2$s über E-mail", "{actor} shared {file} with {email} by mail" : "{actor} teilt {file} mit {email} über E-Mail", - "Password to access %1$s was send to %2s" : "Passwort für den Zugriff auf %1$s wurde an %2s versandt", - "Password to access {file} was send to {email}" : "Passwort für den Zugriff auf {file} wurde an {email} versandt", - "Password to access %1$s was send to you" : "Passwort für den Zugriff auf %1$s wurde an Dich versandt", - "Password to access {file} was send to you" : "Passwort für den Zugriff auf {file} wurde an Dich versandt", "Sharing %s failed, this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automatisch erstelltes Passwort kann nicht versandt werden. Bitte gebe in Deinen persönlichen Einstellungen eine gültige E-Mail-Adresse ein und versuche es erneut.", "Failed to send share by E-mail" : "Senden der Freigabe über Mail ist fehlgeschlagen", @@ -37,7 +33,6 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "Im Teilen-Dialog kannst Du jederzeit ein anderes Passwort wählen.", "Could not find share" : "Freigabe konnte nicht gefunden werden", "Share by mail" : "Geteilt über eine E-Mail", - "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.", "Send password by mail" : "Passwort per Mail senden", "Enforce password protection" : "Passwortschutz erzwingen", "Failed to create the E-mail" : "Erstellen der E-Mail ist fehlgeschalgen", diff --git a/apps/sharebymail/l10n/de.json b/apps/sharebymail/l10n/de.json index 51b31041350..17257a93d23 100644 --- a/apps/sharebymail/l10n/de.json +++ b/apps/sharebymail/l10n/de.json @@ -10,10 +10,6 @@ "You shared {file} with {email} by mail" : "Sie teilen {file} mit {email} über E-Mail", "%3$s shared %1$s with %2$s by mail" : "%3$s teilt %1$s mit %2$s über E-mail", "{actor} shared {file} with {email} by mail" : "{actor} teilt {file} mit {email} über E-Mail", - "Password to access %1$s was send to %2s" : "Passwort für den Zugriff auf %1$s wurde an %2s versandt", - "Password to access {file} was send to {email}" : "Passwort für den Zugriff auf {file} wurde an {email} versandt", - "Password to access %1$s was send to you" : "Passwort für den Zugriff auf %1$s wurde an Dich versandt", - "Password to access {file} was send to you" : "Passwort für den Zugriff auf {file} wurde an Dich versandt", "Sharing %s failed, this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automatisch erstelltes Passwort kann nicht versandt werden. Bitte gebe in Deinen persönlichen Einstellungen eine gültige E-Mail-Adresse ein und versuche es erneut.", "Failed to send share by E-mail" : "Senden der Freigabe über Mail ist fehlgeschlagen", @@ -35,7 +31,6 @@ "You can choose a different password at any time in the share dialog." : "Im Teilen-Dialog kannst Du jederzeit ein anderes Passwort wählen.", "Could not find share" : "Freigabe konnte nicht gefunden werden", "Share by mail" : "Geteilt über eine E-Mail", - "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.", "Send password by mail" : "Passwort per Mail senden", "Enforce password protection" : "Passwortschutz erzwingen", "Failed to create the E-mail" : "Erstellen der E-Mail ist fehlgeschalgen", diff --git a/apps/sharebymail/l10n/de_DE.js b/apps/sharebymail/l10n/de_DE.js index 07965574ab7..f8bd6112921 100644 --- a/apps/sharebymail/l10n/de_DE.js +++ b/apps/sharebymail/l10n/de_DE.js @@ -12,10 +12,6 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "Sie haben {file} mit {email} per E-Mail geteilt ", "%3$s shared %1$s with %2$s by mail" : "%3$s hat %1$s mit %2$s per E-Mail geteilt", "{actor} shared {file} with {email} by mail" : "{actor} hat {file} mit {email} per E-Mail geteilt", - "Password to access %1$s was send to %2s" : "Passwort für den Zugriff auf %1$s wurde an %2s versandt", - "Password to access {file} was send to {email}" : "Passwort für den Zugriff auf {file} wurde an {email} versandt", - "Password to access %1$s was send to you" : "Passwort für den Zugriff auf %1$s wurde an Sie versandt", - "Password to access {file} was send to you" : "Passwort für den Zugriff auf {file} wurde an Sie versandt", "Sharing %s failed, this item is already shared with %s" : "Teilen von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wurde", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automatisch erstelltes Passwort kann nicht versandt werden. Bitte geben Sie in Ihren persönlichen Einstellungen eine gültige E-Mail-Adresse ein und versuche Sie es erneut.", "Failed to send share by E-mail" : "Fehler beim Senden der Freigabe per E-Mail", @@ -37,7 +33,6 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "Im Teilen-Dialog können Sie jederzeit ein anderes Passwort wählen.", "Could not find share" : "Freigabe konnte nicht gefunden werden", "Share by mail" : "Geteilt über eine E-Mail", - "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.", "Send password by mail" : "Passwort per Mail senden", "Enforce password protection" : "Passwortschutz erzwingen", "Failed to create the E-mail" : "Erstellen der E-Mail fehlgeschlagen", diff --git a/apps/sharebymail/l10n/de_DE.json b/apps/sharebymail/l10n/de_DE.json index 5f006cbf504..a9732b375be 100644 --- a/apps/sharebymail/l10n/de_DE.json +++ b/apps/sharebymail/l10n/de_DE.json @@ -10,10 +10,6 @@ "You shared {file} with {email} by mail" : "Sie haben {file} mit {email} per E-Mail geteilt ", "%3$s shared %1$s with %2$s by mail" : "%3$s hat %1$s mit %2$s per E-Mail geteilt", "{actor} shared {file} with {email} by mail" : "{actor} hat {file} mit {email} per E-Mail geteilt", - "Password to access %1$s was send to %2s" : "Passwort für den Zugriff auf %1$s wurde an %2s versandt", - "Password to access {file} was send to {email}" : "Passwort für den Zugriff auf {file} wurde an {email} versandt", - "Password to access %1$s was send to you" : "Passwort für den Zugriff auf %1$s wurde an Sie versandt", - "Password to access {file} was send to you" : "Passwort für den Zugriff auf {file} wurde an Sie versandt", "Sharing %s failed, this item is already shared with %s" : "Teilen von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wurde", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automatisch erstelltes Passwort kann nicht versandt werden. Bitte geben Sie in Ihren persönlichen Einstellungen eine gültige E-Mail-Adresse ein und versuche Sie es erneut.", "Failed to send share by E-mail" : "Fehler beim Senden der Freigabe per E-Mail", @@ -35,7 +31,6 @@ "You can choose a different password at any time in the share dialog." : "Im Teilen-Dialog können Sie jederzeit ein anderes Passwort wählen.", "Could not find share" : "Freigabe konnte nicht gefunden werden", "Share by mail" : "Geteilt über eine E-Mail", - "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.", "Send password by mail" : "Passwort per Mail senden", "Enforce password protection" : "Passwortschutz erzwingen", "Failed to create the E-mail" : "Erstellen der E-Mail fehlgeschlagen", diff --git a/apps/sharebymail/l10n/el.js b/apps/sharebymail/l10n/el.js index 9e78fdf3667..bcd7944b8ff 100644 --- a/apps/sharebymail/l10n/el.js +++ b/apps/sharebymail/l10n/el.js @@ -9,10 +9,6 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "Διαμοιραστήκατε {file} με {email} μέσω mail", "%3$s shared %1$s with %2$s by mail" : "%3$s Διαμοιραστηκε %1$s με %2$s μέσω mail", "{actor} shared {file} with {email} by mail" : "{actor} διαμοίρασε {file} με {email} μέσω mail", - "Password to access %1$s was send to %2s" : "Συνθηματικό για πρόσβαση στο %1$s στάλθηκε στο %2s", - "Password to access {file} was send to {email}" : "Συνθηματικό για πρόσβαση στο {file} στάλθηκε στο {email}", - "Password to access %1$s was send to you" : "Συνθηματικό για πρόσβαση στο %1$s στάλθηκε σε εσάς", - "Password to access {file} was send to you" : "Συνθηματικό για πρόσβαση στο {file} στάλθηκε σε εσας", "Sharing %s failed, this item is already shared with %s" : "Διαμοιρασμός %s απέτυχε, αυτό το αντικείμενο είναι ήδη διαμοιρασμένο με %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Δεν μπορούμε να σας στείλουμε αυτοδημιουργημένο συνθηματικό. Παρακαλούμε βάλτε μία έγκυρη διεύθυνση email στις προσωπικές σας ρυθμίσεις και προσπαθήστε ξανά.", "Failed to send share by E-mail" : "Αποτυχία αποστολής συνδέσμου διαμοιρασμού μέσω Ηλ.ταχυδρομείου", @@ -34,7 +30,6 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "Μπορείτε να διαλέξετε ένα διαφορετικό συνθηματικό οποιαδήποτε στιγμή στον διάλογο διαμοιρασμού.", "Could not find share" : "Αδυναμία εύρεσης κοινόχρηστου", "Share by mail" : "Διαμοιρασμός με ηλεκτρονική αλληλογραφία", - "Send a personalized link to a file or folder by mail." : "Στείλτε έναν εξατομικευμένο σύνδεσμο σε ένα αρχείο ή φάκελο μέσω mail.", "Send password by mail" : "Αποστολή συνθηματικου με ηλεκτρονική αλληλογραφία", "Enforce password protection" : "Επιβάλετε προστασία συνθηματικού", "Failed to create the E-mail" : "Αποτυχία δημιουργίας του Ηλ.ταχυδρομείου", diff --git a/apps/sharebymail/l10n/el.json b/apps/sharebymail/l10n/el.json index cf364ce9efa..f5f4f5f88e6 100644 --- a/apps/sharebymail/l10n/el.json +++ b/apps/sharebymail/l10n/el.json @@ -7,10 +7,6 @@ "You shared {file} with {email} by mail" : "Διαμοιραστήκατε {file} με {email} μέσω mail", "%3$s shared %1$s with %2$s by mail" : "%3$s Διαμοιραστηκε %1$s με %2$s μέσω mail", "{actor} shared {file} with {email} by mail" : "{actor} διαμοίρασε {file} με {email} μέσω mail", - "Password to access %1$s was send to %2s" : "Συνθηματικό για πρόσβαση στο %1$s στάλθηκε στο %2s", - "Password to access {file} was send to {email}" : "Συνθηματικό για πρόσβαση στο {file} στάλθηκε στο {email}", - "Password to access %1$s was send to you" : "Συνθηματικό για πρόσβαση στο %1$s στάλθηκε σε εσάς", - "Password to access {file} was send to you" : "Συνθηματικό για πρόσβαση στο {file} στάλθηκε σε εσας", "Sharing %s failed, this item is already shared with %s" : "Διαμοιρασμός %s απέτυχε, αυτό το αντικείμενο είναι ήδη διαμοιρασμένο με %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Δεν μπορούμε να σας στείλουμε αυτοδημιουργημένο συνθηματικό. Παρακαλούμε βάλτε μία έγκυρη διεύθυνση email στις προσωπικές σας ρυθμίσεις και προσπαθήστε ξανά.", "Failed to send share by E-mail" : "Αποτυχία αποστολής συνδέσμου διαμοιρασμού μέσω Ηλ.ταχυδρομείου", @@ -32,7 +28,6 @@ "You can choose a different password at any time in the share dialog." : "Μπορείτε να διαλέξετε ένα διαφορετικό συνθηματικό οποιαδήποτε στιγμή στον διάλογο διαμοιρασμού.", "Could not find share" : "Αδυναμία εύρεσης κοινόχρηστου", "Share by mail" : "Διαμοιρασμός με ηλεκτρονική αλληλογραφία", - "Send a personalized link to a file or folder by mail." : "Στείλτε έναν εξατομικευμένο σύνδεσμο σε ένα αρχείο ή φάκελο μέσω mail.", "Send password by mail" : "Αποστολή συνθηματικου με ηλεκτρονική αλληλογραφία", "Enforce password protection" : "Επιβάλετε προστασία συνθηματικού", "Failed to create the E-mail" : "Αποτυχία δημιουργίας του Ηλ.ταχυδρομείου", diff --git a/apps/sharebymail/l10n/es_MX.js b/apps/sharebymail/l10n/es_MX.js index 6af9a6b8881..bf4a894deff 100644 --- a/apps/sharebymail/l10n/es_MX.js +++ b/apps/sharebymail/l10n/es_MX.js @@ -12,10 +12,6 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "Usted ha compartido {file} con {email} por correo", "%3$s shared %1$s with %2$s by mail" : "%3$s ha compartido %1$s con %2$s por correo ", "{actor} shared {file} with {email} by mail" : "{actor} ha compartido {file} con {email} por correo", - "Password to access %1$s was send to %2s" : "La contraseña para acceder a %1$s fue enviada a %2s", - "Password to access {file} was send to {email}" : "La contraseña para acceder {file} fue enviada a {email}", - "Password to access %1$s was send to you" : "La contraseña para acceder %1$s le ha sido enviada", - "Password to access {file} was send to you" : "La contraseña para acceder {file} le ha sido enviada", "Sharing %s failed, this item is already shared with %s" : "Se presentó una falla al compartir %s, este elemento ya ha sido compartido con %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "No es posible enviarle la contraseña auto-generada. Favor de establecer una dirección de correo electrónico váilida en sus ajustes personales y volver a intentarlo.", "Failed to send share by E-mail" : "Se presentó una falla al enviar el recurso compartido por correo electrónico", @@ -37,7 +33,6 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "Puede elegir una contraseña diferente en cualquier momento en la ventana de diálogo de compartir. ", "Could not find share" : "No fue posible encontrar el elemento compartido", "Share by mail" : "Compartir por correo", - "Send a personalized link to a file or folder by mail." : "Enviar por correo una liga personalizada a un archivo o carpeta.", "Send password by mail" : "La contraseña ha sido enviada por correo", "Enforce password protection" : "Forzar protección con contraseña", "Failed to create the E-mail" : "Se presentó una falla al crear el correo electrónico", diff --git a/apps/sharebymail/l10n/es_MX.json b/apps/sharebymail/l10n/es_MX.json index cb6f605aaba..a18fb0eb0b2 100644 --- a/apps/sharebymail/l10n/es_MX.json +++ b/apps/sharebymail/l10n/es_MX.json @@ -10,10 +10,6 @@ "You shared {file} with {email} by mail" : "Usted ha compartido {file} con {email} por correo", "%3$s shared %1$s with %2$s by mail" : "%3$s ha compartido %1$s con %2$s por correo ", "{actor} shared {file} with {email} by mail" : "{actor} ha compartido {file} con {email} por correo", - "Password to access %1$s was send to %2s" : "La contraseña para acceder a %1$s fue enviada a %2s", - "Password to access {file} was send to {email}" : "La contraseña para acceder {file} fue enviada a {email}", - "Password to access %1$s was send to you" : "La contraseña para acceder %1$s le ha sido enviada", - "Password to access {file} was send to you" : "La contraseña para acceder {file} le ha sido enviada", "Sharing %s failed, this item is already shared with %s" : "Se presentó una falla al compartir %s, este elemento ya ha sido compartido con %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "No es posible enviarle la contraseña auto-generada. Favor de establecer una dirección de correo electrónico váilida en sus ajustes personales y volver a intentarlo.", "Failed to send share by E-mail" : "Se presentó una falla al enviar el recurso compartido por correo electrónico", @@ -35,7 +31,6 @@ "You can choose a different password at any time in the share dialog." : "Puede elegir una contraseña diferente en cualquier momento en la ventana de diálogo de compartir. ", "Could not find share" : "No fue posible encontrar el elemento compartido", "Share by mail" : "Compartir por correo", - "Send a personalized link to a file or folder by mail." : "Enviar por correo una liga personalizada a un archivo o carpeta.", "Send password by mail" : "La contraseña ha sido enviada por correo", "Enforce password protection" : "Forzar protección con contraseña", "Failed to create the E-mail" : "Se presentó una falla al crear el correo electrónico", diff --git a/apps/sharebymail/l10n/fr.js b/apps/sharebymail/l10n/fr.js index dfbab595012..f8341861a42 100644 --- a/apps/sharebymail/l10n/fr.js +++ b/apps/sharebymail/l10n/fr.js @@ -12,10 +12,6 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "Vous avez partagé {file} avec {email} par email", "%3$s shared %1$s with %2$s by mail" : "%3$s a partagé %1$s avec %2$s par email", "{actor} shared {file} with {email} by mail" : "{actor} a partagé {file} avec {email} par email", - "Password to access %1$s was send to %2s" : "Le mot de passe pour accèder à %1$s a été envoyé à %2s", - "Password to access {file} was send to {email}" : "Le mot de passe pour accèder à {file} a été envoyé à {email}", - "Password to access %1$s was send to you" : "Le mot de passe pour accèder à %1$s vous a été envoyé", - "Password to access {file} was send to you" : "Le mot de passe pour accèder à {file} vous a été envoyé", "Sharing %s failed, this item is already shared with %s" : "Le partage de %s a échoué, cet élément est déjà partagé avec %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Nous ne pouvons pas vous envoyer le mot de passe généré automatiquement. Veuillez renseigner une adresse e-mail valide dans vos paramètres personnels puis réessayer.", "Failed to send share by E-mail" : "Erreur lors de l'envoi du partage par email", @@ -37,7 +33,6 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "Vous pouvez choisir un mot de passe différent à n'importe quel moment dans la boîte de dialogue de partage.", "Could not find share" : "Impossible de trouver le partage", "Share by mail" : "Partage par email", - "Send a personalized link to a file or folder by mail." : "Envoyer un lien personnalisé vers un fichier ou un dossier par email.", "Send password by mail" : "Envoyer le mot de passe par email", "Enforce password protection" : "Imposer la protection par mot de passe", "Failed to create the E-mail" : "Erreur lors de la création du mail", diff --git a/apps/sharebymail/l10n/fr.json b/apps/sharebymail/l10n/fr.json index a4e5256a162..78d51ed6116 100644 --- a/apps/sharebymail/l10n/fr.json +++ b/apps/sharebymail/l10n/fr.json @@ -10,10 +10,6 @@ "You shared {file} with {email} by mail" : "Vous avez partagé {file} avec {email} par email", "%3$s shared %1$s with %2$s by mail" : "%3$s a partagé %1$s avec %2$s par email", "{actor} shared {file} with {email} by mail" : "{actor} a partagé {file} avec {email} par email", - "Password to access %1$s was send to %2s" : "Le mot de passe pour accèder à %1$s a été envoyé à %2s", - "Password to access {file} was send to {email}" : "Le mot de passe pour accèder à {file} a été envoyé à {email}", - "Password to access %1$s was send to you" : "Le mot de passe pour accèder à %1$s vous a été envoyé", - "Password to access {file} was send to you" : "Le mot de passe pour accèder à {file} vous a été envoyé", "Sharing %s failed, this item is already shared with %s" : "Le partage de %s a échoué, cet élément est déjà partagé avec %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Nous ne pouvons pas vous envoyer le mot de passe généré automatiquement. Veuillez renseigner une adresse e-mail valide dans vos paramètres personnels puis réessayer.", "Failed to send share by E-mail" : "Erreur lors de l'envoi du partage par email", @@ -35,7 +31,6 @@ "You can choose a different password at any time in the share dialog." : "Vous pouvez choisir un mot de passe différent à n'importe quel moment dans la boîte de dialogue de partage.", "Could not find share" : "Impossible de trouver le partage", "Share by mail" : "Partage par email", - "Send a personalized link to a file or folder by mail." : "Envoyer un lien personnalisé vers un fichier ou un dossier par email.", "Send password by mail" : "Envoyer le mot de passe par email", "Enforce password protection" : "Imposer la protection par mot de passe", "Failed to create the E-mail" : "Erreur lors de la création du mail", diff --git a/apps/sharebymail/l10n/nb.js b/apps/sharebymail/l10n/nb.js index 0e308b95a11..77ff5479075 100644 --- a/apps/sharebymail/l10n/nb.js +++ b/apps/sharebymail/l10n/nb.js @@ -5,11 +5,15 @@ OC.L10N.register( "Shared with {email}" : "Delt med {email}", "Shared with %1$s by %2$s" : "Delt med %1$s via %2$s", "Shared with {email} by {actor}" : "Delt med {email} av {actor}", + "Password for mail share sent to %1$s" : "Passord for e-postlager sendt til %1$s", + "Password for mail share sent to {email}" : "Passord for e-postlager sendt til {email}", + "Password for mail share sent to you" : "Passord for e-postlager sendt til deg", "You shared %1$s with %2$s by mail" : "Du delte %1$s med %2$s via e-post", "You shared {file} with {email} by mail" : "Du delte {file} med {email} via e-post", "%3$s shared %1$s with %2$s by mail" : "%3$s delte %1$s med %2$s via e-post", "{actor} shared {file} with {email} by mail" : "{actor} delte {file} med {email} via e-post", "Sharing %s failed, this item is already shared with %s" : "Deling %s feilet, dette elementet er allerede delt med %s", + "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Vi kan ikke sende det auto-genererte passordet. Angi en gyldig e-postadresse i dine personlige innstillinger og prøv igjen.", "Failed to send share by E-mail" : "Feilet når delingen skulle sendes på epost", "%s shared »%s« with you" : "%s delte »%s« med deg", "%s shared »%s« with you on behalf of %s" : "%s delte »%s« med deg på vegne av %s", @@ -24,11 +28,11 @@ OC.L10N.register( "Password to access »%s«" : "Passord for å benytte »%s«", "It is protected with the following password: %s" : "Den er beskyttet med følgende passord: %s", "Password to access »%s« shared with %s" : "Passord for å benytte »%s« delt med %s", + "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "Du delte akkurat »%s« med %s. Lageret har allerede blitt sendt til mottakeren. På grunn av sikkerhetspraksisen definert av administratoren for %s må hvert lager beskyttes med et passord, og det tillates ikke sendt direkte til mottakeren. Derfor trenger du å sende passordet manuelt til mottakeren.", "This is the password: %s" : "Dette er passordet: %s", "You can choose a different password at any time in the share dialog." : "Du kan velge et annet passord når som helst i delingsdialogvinduet.", "Could not find share" : "Delingen ble ikke funnet", "Share by mail" : "Del via e-post", - "Send a personalized link to a file or folder by mail." : "Send en personalisert lenke til ei fil eller mappe via e-post.", "Send password by mail" : "Send passord via e-post", "Enforce password protection" : "Krev passordbeskyttelse", "Failed to create the E-mail" : "Feilet ved opprettelse av epost", diff --git a/apps/sharebymail/l10n/nb.json b/apps/sharebymail/l10n/nb.json index 06f4d73e218..3c3e1fc30b8 100644 --- a/apps/sharebymail/l10n/nb.json +++ b/apps/sharebymail/l10n/nb.json @@ -3,11 +3,15 @@ "Shared with {email}" : "Delt med {email}", "Shared with %1$s by %2$s" : "Delt med %1$s via %2$s", "Shared with {email} by {actor}" : "Delt med {email} av {actor}", + "Password for mail share sent to %1$s" : "Passord for e-postlager sendt til %1$s", + "Password for mail share sent to {email}" : "Passord for e-postlager sendt til {email}", + "Password for mail share sent to you" : "Passord for e-postlager sendt til deg", "You shared %1$s with %2$s by mail" : "Du delte %1$s med %2$s via e-post", "You shared {file} with {email} by mail" : "Du delte {file} med {email} via e-post", "%3$s shared %1$s with %2$s by mail" : "%3$s delte %1$s med %2$s via e-post", "{actor} shared {file} with {email} by mail" : "{actor} delte {file} med {email} via e-post", "Sharing %s failed, this item is already shared with %s" : "Deling %s feilet, dette elementet er allerede delt med %s", + "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Vi kan ikke sende det auto-genererte passordet. Angi en gyldig e-postadresse i dine personlige innstillinger og prøv igjen.", "Failed to send share by E-mail" : "Feilet når delingen skulle sendes på epost", "%s shared »%s« with you" : "%s delte »%s« med deg", "%s shared »%s« with you on behalf of %s" : "%s delte »%s« med deg på vegne av %s", @@ -22,11 +26,11 @@ "Password to access »%s«" : "Passord for å benytte »%s«", "It is protected with the following password: %s" : "Den er beskyttet med følgende passord: %s", "Password to access »%s« shared with %s" : "Passord for å benytte »%s« delt med %s", + "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "Du delte akkurat »%s« med %s. Lageret har allerede blitt sendt til mottakeren. På grunn av sikkerhetspraksisen definert av administratoren for %s må hvert lager beskyttes med et passord, og det tillates ikke sendt direkte til mottakeren. Derfor trenger du å sende passordet manuelt til mottakeren.", "This is the password: %s" : "Dette er passordet: %s", "You can choose a different password at any time in the share dialog." : "Du kan velge et annet passord når som helst i delingsdialogvinduet.", "Could not find share" : "Delingen ble ikke funnet", "Share by mail" : "Del via e-post", - "Send a personalized link to a file or folder by mail." : "Send en personalisert lenke til ei fil eller mappe via e-post.", "Send password by mail" : "Send passord via e-post", "Enforce password protection" : "Krev passordbeskyttelse", "Failed to create the E-mail" : "Feilet ved opprettelse av epost", diff --git a/apps/sharebymail/l10n/nl.js b/apps/sharebymail/l10n/nl.js index 99f0908711a..87178916a62 100644 --- a/apps/sharebymail/l10n/nl.js +++ b/apps/sharebymail/l10n/nl.js @@ -12,10 +12,6 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "Je deelde {file} met {email} via e-mail", "%3$s shared %1$s with %2$s by mail" : "%3$s deelde %1$s met %2$s via e-mail", "{actor} shared {file} with {email} by mail" : "{actor} deelde {file} met {email} via e-mail", - "Password to access %1$s was send to %2s" : "Wachtwoord voor toegang tot %1$s gestuurd naar %2s", - "Password to access {file} was send to {email}" : "Wachtwoord voor toegang tot {file} gestuurd naar {email}", - "Password to access %1$s was send to you" : "Wachtwoord voor toegang tot %1$s naar jou gestuurd", - "Password to access {file} was send to you" : "Wachtwoord voor toegang tot {file} naar jou gestuurd", "Sharing %s failed, this item is already shared with %s" : "Delen van %s is mislukt, omdat dit al gedeeld wordt met %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "We kunnen je geen automatisch gegenereerd wachtwoord toesturen. Vermeld een geldig e-mailadres in je persoonlijke instellingen en probeer het nogmaals.", "Failed to send share by E-mail" : "Fout bij delen via e-mail", @@ -37,7 +33,6 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "Je kunt in de Delen-dialoog altijd een ander wachtwoord kiezen.", "Could not find share" : "Kon gedeeld niet vinden", "Share by mail" : "Gedeeld via een E-mail", - "Send a personalized link to a file or folder by mail." : "Zend een gepersonialiseerde link naar een bestand of map per mail.", "Send password by mail" : "Wachtwoord per E-mail verzenden", "Enforce password protection" : "Afdwingenwachtwoordbeveiliging", "Failed to create the E-mail" : "Opmaken van de e-mail is mislukt", diff --git a/apps/sharebymail/l10n/nl.json b/apps/sharebymail/l10n/nl.json index ae63900e6b9..d1de92a795f 100644 --- a/apps/sharebymail/l10n/nl.json +++ b/apps/sharebymail/l10n/nl.json @@ -10,10 +10,6 @@ "You shared {file} with {email} by mail" : "Je deelde {file} met {email} via e-mail", "%3$s shared %1$s with %2$s by mail" : "%3$s deelde %1$s met %2$s via e-mail", "{actor} shared {file} with {email} by mail" : "{actor} deelde {file} met {email} via e-mail", - "Password to access %1$s was send to %2s" : "Wachtwoord voor toegang tot %1$s gestuurd naar %2s", - "Password to access {file} was send to {email}" : "Wachtwoord voor toegang tot {file} gestuurd naar {email}", - "Password to access %1$s was send to you" : "Wachtwoord voor toegang tot %1$s naar jou gestuurd", - "Password to access {file} was send to you" : "Wachtwoord voor toegang tot {file} naar jou gestuurd", "Sharing %s failed, this item is already shared with %s" : "Delen van %s is mislukt, omdat dit al gedeeld wordt met %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "We kunnen je geen automatisch gegenereerd wachtwoord toesturen. Vermeld een geldig e-mailadres in je persoonlijke instellingen en probeer het nogmaals.", "Failed to send share by E-mail" : "Fout bij delen via e-mail", @@ -35,7 +31,6 @@ "You can choose a different password at any time in the share dialog." : "Je kunt in de Delen-dialoog altijd een ander wachtwoord kiezen.", "Could not find share" : "Kon gedeeld niet vinden", "Share by mail" : "Gedeeld via een E-mail", - "Send a personalized link to a file or folder by mail." : "Zend een gepersonialiseerde link naar een bestand of map per mail.", "Send password by mail" : "Wachtwoord per E-mail verzenden", "Enforce password protection" : "Afdwingenwachtwoordbeveiliging", "Failed to create the E-mail" : "Opmaken van de e-mail is mislukt", diff --git a/apps/sharebymail/l10n/pt_BR.js b/apps/sharebymail/l10n/pt_BR.js index 546f4d6a91f..08e6e1b0191 100644 --- a/apps/sharebymail/l10n/pt_BR.js +++ b/apps/sharebymail/l10n/pt_BR.js @@ -12,10 +12,6 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "Você compartilhou {file} com {email} por email", "%3$s shared %1$s with %2$s by mail" : "%3$s compartilou %1$s com %2$s por email", "{actor} shared {file} with {email} by mail" : "{actor} compartilhou {file} com {email} por email", - "Password to access %1$s was send to %2s" : "A senha para acessar %1$s foi enviada para %2s", - "Password to access {file} was send to {email}" : "A senha para acessar {file} foi enviada para {email}", - "Password to access %1$s was send to you" : "A senha para acessar %1$s foi enviada para você", - "Password to access {file} was send to you" : "A senha para acessar {file} foi enviada para você", "Sharing %s failed, this item is already shared with %s" : "O compartilhamento %s falhou, pois este item já está compartilhado com %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Não pudemos enviar a você a senha auto-gerada. por favor defina um email válido em sua configuração e tente novamente.", "Failed to send share by E-mail" : "Falha ao enviar compartilhamento por email", @@ -37,7 +33,6 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "Você pode escolher uma senha diferente a qualquer momento no diálogo compartilhamento.", "Could not find share" : "Não foi possível encontrar o compartilhamento", "Share by mail" : "Compartilhamento por email", - "Send a personalized link to a file or folder by mail." : "Envie um link personalizado para um arquivo ou pasta por email.", "Send password by mail" : "Enviar senha por email", "Enforce password protection" : "Reforce a proteção por senha", "Failed to create the E-mail" : "Falhou ao criar o email", diff --git a/apps/sharebymail/l10n/pt_BR.json b/apps/sharebymail/l10n/pt_BR.json index f71da37e9ea..7daeb9bbcf9 100644 --- a/apps/sharebymail/l10n/pt_BR.json +++ b/apps/sharebymail/l10n/pt_BR.json @@ -10,10 +10,6 @@ "You shared {file} with {email} by mail" : "Você compartilhou {file} com {email} por email", "%3$s shared %1$s with %2$s by mail" : "%3$s compartilou %1$s com %2$s por email", "{actor} shared {file} with {email} by mail" : "{actor} compartilhou {file} com {email} por email", - "Password to access %1$s was send to %2s" : "A senha para acessar %1$s foi enviada para %2s", - "Password to access {file} was send to {email}" : "A senha para acessar {file} foi enviada para {email}", - "Password to access %1$s was send to you" : "A senha para acessar %1$s foi enviada para você", - "Password to access {file} was send to you" : "A senha para acessar {file} foi enviada para você", "Sharing %s failed, this item is already shared with %s" : "O compartilhamento %s falhou, pois este item já está compartilhado com %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Não pudemos enviar a você a senha auto-gerada. por favor defina um email válido em sua configuração e tente novamente.", "Failed to send share by E-mail" : "Falha ao enviar compartilhamento por email", @@ -35,7 +31,6 @@ "You can choose a different password at any time in the share dialog." : "Você pode escolher uma senha diferente a qualquer momento no diálogo compartilhamento.", "Could not find share" : "Não foi possível encontrar o compartilhamento", "Share by mail" : "Compartilhamento por email", - "Send a personalized link to a file or folder by mail." : "Envie um link personalizado para um arquivo ou pasta por email.", "Send password by mail" : "Enviar senha por email", "Enforce password protection" : "Reforce a proteção por senha", "Failed to create the E-mail" : "Falhou ao criar o email", diff --git a/apps/sharebymail/l10n/ru.js b/apps/sharebymail/l10n/ru.js index ad8fe7f712f..c339c8a82a8 100644 --- a/apps/sharebymail/l10n/ru.js +++ b/apps/sharebymail/l10n/ru.js @@ -12,10 +12,6 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "Вы предоставили общий доступ к {file} для {email} по email", "%3$s shared %1$s with %2$s by mail" : "%3$s предоставил общий доступ к %1$s для %2$s по email", "{actor} shared {file} with {email} by mail" : "{actor} предоставил общий доступ к {file} для {email} по email", - "Password to access %1$s was send to %2s" : "Пароль для доступа к %1$s отправлен %2s", - "Password to access {file} was send to {email}" : "Пароль для доступа к {file} отправлен {email}", - "Password to access %1$s was send to you" : "Пароль для доступа к %1$s отправлен вам", - "Password to access {file} was send to you" : "Пароль для доступа к {file} отправлен вам", "Sharing %s failed, this item is already shared with %s" : "Не удалось поделиться %s, к этому элементу уже предоставлен общий доступ для %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Не удаётся отправить вам автоматически созданный пароль. Укажите верный адрес email в своих личных настройках и попробуйте снова.", "Failed to send share by E-mail" : "Не удалось поделиться по e-mail", @@ -37,7 +33,6 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "В любой момент можно выбрать другой паорль в диалоге «Общий доступ».", "Could not find share" : "Не удалось найти общий ресурс", "Share by mail" : "Поделиться по почте", - "Send a personalized link to a file or folder by mail." : "Отправить персональную ссылку на файл или каталог по почте.", "Send password by mail" : "Отправить пароль почтой", "Enforce password protection" : "Требовать защиту паролем", "Failed to create the E-mail" : "Не удалось создать e-mail", diff --git a/apps/sharebymail/l10n/ru.json b/apps/sharebymail/l10n/ru.json index 38349f27a00..7e49354ab96 100644 --- a/apps/sharebymail/l10n/ru.json +++ b/apps/sharebymail/l10n/ru.json @@ -10,10 +10,6 @@ "You shared {file} with {email} by mail" : "Вы предоставили общий доступ к {file} для {email} по email", "%3$s shared %1$s with %2$s by mail" : "%3$s предоставил общий доступ к %1$s для %2$s по email", "{actor} shared {file} with {email} by mail" : "{actor} предоставил общий доступ к {file} для {email} по email", - "Password to access %1$s was send to %2s" : "Пароль для доступа к %1$s отправлен %2s", - "Password to access {file} was send to {email}" : "Пароль для доступа к {file} отправлен {email}", - "Password to access %1$s was send to you" : "Пароль для доступа к %1$s отправлен вам", - "Password to access {file} was send to you" : "Пароль для доступа к {file} отправлен вам", "Sharing %s failed, this item is already shared with %s" : "Не удалось поделиться %s, к этому элементу уже предоставлен общий доступ для %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Не удаётся отправить вам автоматически созданный пароль. Укажите верный адрес email в своих личных настройках и попробуйте снова.", "Failed to send share by E-mail" : "Не удалось поделиться по e-mail", @@ -35,7 +31,6 @@ "You can choose a different password at any time in the share dialog." : "В любой момент можно выбрать другой паорль в диалоге «Общий доступ».", "Could not find share" : "Не удалось найти общий ресурс", "Share by mail" : "Поделиться по почте", - "Send a personalized link to a file or folder by mail." : "Отправить персональную ссылку на файл или каталог по почте.", "Send password by mail" : "Отправить пароль почтой", "Enforce password protection" : "Требовать защиту паролем", "Failed to create the E-mail" : "Не удалось создать e-mail", diff --git a/apps/sharebymail/l10n/tr.js b/apps/sharebymail/l10n/tr.js index 6ec729f7278..2521ebd0e7d 100644 --- a/apps/sharebymail/l10n/tr.js +++ b/apps/sharebymail/l10n/tr.js @@ -12,10 +12,6 @@ OC.L10N.register( "You shared {file} with {email} by mail" : "{file} dosyasını {email} ile e-posta üzerinden paylaştınız", "%3$s shared %1$s with %2$s by mail" : "%3$s, %1$s dosyasını %2$s ile e-posta üzerinden paylaştı", "{actor} shared {file} with {email} by mail" : "{actor}, {file} dosyasını {email} ile e-posta üzerinden paylaştı", - "Password to access %1$s was send to %2s" : "%1$s dosyasına erişim parolası %2s adresine gönderildi", - "Password to access {file} was send to {email}" : "{file} dosyasına erişim parolası {email} adresine gönderildi", - "Password to access %1$s was send to you" : "%1$s dosyasına erişim parolası size gönderildi", - "Password to access {file} was send to you" : "{file} dosyasına erişim parolası size gönderildi", "Sharing %s failed, this item is already shared with %s" : "%s paylaşılamadı, bu öge zaten %s ile paylaşılmış", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Otomatik üretilen parola size gönderilemedi. Lütfen kişisel ayarlarınızdan geçerli bir e-posta adresi ayarlayın ve yeniden deneyin.", "Failed to send share by E-mail" : "Paylaşım e-postası gönderilemedi", @@ -37,7 +33,6 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "İstediğiniz zaman paylaşım bölümünden farklı bir parola belirtebilirsiniz.", "Could not find share" : "Paylaşım bulunamadı", "Share by mail" : "E-posta ile paylaş", - "Send a personalized link to a file or folder by mail." : "Bir dosya ya da klasörün kişiselleştirilmiş bağlantısını e-posta ile gönderin.", "Send password by mail" : "Parolayı e-posta ile gönder", "Enforce password protection" : "Parola koruması dayatılsın", "Failed to create the E-mail" : "E-posta oluşturulamadı", diff --git a/apps/sharebymail/l10n/tr.json b/apps/sharebymail/l10n/tr.json index a10c5ff8986..87c6a29f011 100644 --- a/apps/sharebymail/l10n/tr.json +++ b/apps/sharebymail/l10n/tr.json @@ -10,10 +10,6 @@ "You shared {file} with {email} by mail" : "{file} dosyasını {email} ile e-posta üzerinden paylaştınız", "%3$s shared %1$s with %2$s by mail" : "%3$s, %1$s dosyasını %2$s ile e-posta üzerinden paylaştı", "{actor} shared {file} with {email} by mail" : "{actor}, {file} dosyasını {email} ile e-posta üzerinden paylaştı", - "Password to access %1$s was send to %2s" : "%1$s dosyasına erişim parolası %2s adresine gönderildi", - "Password to access {file} was send to {email}" : "{file} dosyasına erişim parolası {email} adresine gönderildi", - "Password to access %1$s was send to you" : "%1$s dosyasına erişim parolası size gönderildi", - "Password to access {file} was send to you" : "{file} dosyasına erişim parolası size gönderildi", "Sharing %s failed, this item is already shared with %s" : "%s paylaşılamadı, bu öge zaten %s ile paylaşılmış", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Otomatik üretilen parola size gönderilemedi. Lütfen kişisel ayarlarınızdan geçerli bir e-posta adresi ayarlayın ve yeniden deneyin.", "Failed to send share by E-mail" : "Paylaşım e-postası gönderilemedi", @@ -35,7 +31,6 @@ "You can choose a different password at any time in the share dialog." : "İstediğiniz zaman paylaşım bölümünden farklı bir parola belirtebilirsiniz.", "Could not find share" : "Paylaşım bulunamadı", "Share by mail" : "E-posta ile paylaş", - "Send a personalized link to a file or folder by mail." : "Bir dosya ya da klasörün kişiselleştirilmiş bağlantısını e-posta ile gönderin.", "Send password by mail" : "Parolayı e-posta ile gönder", "Enforce password protection" : "Parola koruması dayatılsın", "Failed to create the E-mail" : "E-posta oluşturulamadı", diff --git a/apps/sharebymail/lib/Activity.php b/apps/sharebymail/lib/Activity.php index 6dc462bf492..73751cb241e 100644 --- a/apps/sharebymail/lib/Activity.php +++ b/apps/sharebymail/lib/Activity.php @@ -173,17 +173,17 @@ class Activity implements IProvider { ->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters) ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'))); } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) { - $event->setParsedSubject($this->l->t('Password to access %1$s was send to %2s', [ + $event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [ $parsedParameters['file']['path'], $parsedParameters['email']['name'] ])) - ->setRichSubject($this->l->t('Password to access {file} was send to {email}'), $parsedParameters) + ->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters) ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'))); } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) { $event->setParsedSubject( - $this->l->t('Password to access %1$s was send to you', + $this->l->t('Password to access %1$s was sent to you', [$parsedParameters['file']['path']])) - ->setRichSubject($this->l->t('Password to access {file} was send to you'), $parsedParameters) + ->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters) ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'))); } else { diff --git a/apps/updatenotification/l10n/is.js b/apps/updatenotification/l10n/is.js index 5c118d23518..ae4dd1894fe 100644 --- a/apps/updatenotification/l10n/is.js +++ b/apps/updatenotification/l10n/is.js @@ -6,6 +6,7 @@ OC.L10N.register( "{version} is available. Get more information on how to update." : "{version} er í boði. Fáðu frekari upplýsingar um hvernig á að uppfæra.", "Channel updated" : "Rás uppfærð", "The update server could not be reached since %d days to check for new updates." : "Ekki hefur verið hægt að nálgast uppfærsluþjóninn í %d daga til að athuga með nýjar uppfærslur.", + "Please check the Nextcloud and server log files for errors." : "Skoðaðu hvort einhver villuboð séu í annálaskrám Nextcloud þjónsins.", "Update to %1$s is available." : "Uppfærsla fyrir %1$s er tiltæk.", "Update for %1$s to version %2$s is available." : "Uppfærsla %1$s í útgáfu %2$s er tiltæk.", "Update for {app} to version %s is available." : "Uppfærsla fyrir {app} í útgáfu %s er tiltæk.", diff --git a/apps/updatenotification/l10n/is.json b/apps/updatenotification/l10n/is.json index 758ade75705..7682520c169 100644 --- a/apps/updatenotification/l10n/is.json +++ b/apps/updatenotification/l10n/is.json @@ -4,6 +4,7 @@ "{version} is available. Get more information on how to update." : "{version} er í boði. Fáðu frekari upplýsingar um hvernig á að uppfæra.", "Channel updated" : "Rás uppfærð", "The update server could not be reached since %d days to check for new updates." : "Ekki hefur verið hægt að nálgast uppfærsluþjóninn í %d daga til að athuga með nýjar uppfærslur.", + "Please check the Nextcloud and server log files for errors." : "Skoðaðu hvort einhver villuboð séu í annálaskrám Nextcloud þjónsins.", "Update to %1$s is available." : "Uppfærsla fyrir %1$s er tiltæk.", "Update for %1$s to version %2$s is available." : "Uppfærsla %1$s í útgáfu %2$s er tiltæk.", "Update for {app} to version %s is available." : "Uppfærsla fyrir {app} í útgáfu %s er tiltæk.", diff --git a/apps/updatenotification/l10n/nb.js b/apps/updatenotification/l10n/nb.js index 8ec22fad947..5e05b025299 100644 --- a/apps/updatenotification/l10n/nb.js +++ b/apps/updatenotification/l10n/nb.js @@ -5,6 +5,7 @@ OC.L10N.register( "Could not start updater, please try the manual update" : "Kunne ikke starte oppdateringen, prøv å oppdatere manuelt", "{version} is available. Get more information on how to update." : "{version} er tilgjengelig. Få mer informasjon om å oppdatere.", "Channel updated" : "Kanal oppdatert", + "The update server could not be reached since %d days to check for new updates." : "Har ikke oppnådd kontakt med oppdateringstjeneren på %d dager for å se etter nye oppdateringer.", "Please check the Nextcloud and server log files for errors." : "Se i Nextcloud- og tjener-loggen etter feil.", "Update to %1$s is available." : "Oppdatering til %1$s er tilgjengelig.", "Update for %1$s to version %2$s is available." : "Oppdatering for %1$s til versjon %2$s er tilgjengelig.", diff --git a/apps/updatenotification/l10n/nb.json b/apps/updatenotification/l10n/nb.json index 8f700c9c3b1..41fb9d83e00 100644 --- a/apps/updatenotification/l10n/nb.json +++ b/apps/updatenotification/l10n/nb.json @@ -3,6 +3,7 @@ "Could not start updater, please try the manual update" : "Kunne ikke starte oppdateringen, prøv å oppdatere manuelt", "{version} is available. Get more information on how to update." : "{version} er tilgjengelig. Få mer informasjon om å oppdatere.", "Channel updated" : "Kanal oppdatert", + "The update server could not be reached since %d days to check for new updates." : "Har ikke oppnådd kontakt med oppdateringstjeneren på %d dager for å se etter nye oppdateringer.", "Please check the Nextcloud and server log files for errors." : "Se i Nextcloud- og tjener-loggen etter feil.", "Update to %1$s is available." : "Oppdatering til %1$s er tilgjengelig.", "Update for %1$s to version %2$s is available." : "Oppdatering for %1$s til versjon %2$s er tilgjengelig.", diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js index 723a2ab4149..16be6a4ba1b 100644 --- a/apps/user_ldap/l10n/de.js +++ b/apps/user_ldap/l10n/de.js @@ -56,7 +56,6 @@ OC.L10N.register( "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Das Gruppenfeld wurde deaktiviert, da der LDAP / AD-Server memberOf nicht unterstützt.", "Password change rejected. Hint: " : "Passwortändertung verweigert. Hinweis:", "Please login with the new password" : "Bitte mit dem neuen Passwort anmelden", - "Your password will expire within %s day(s)." : "Dein Passwort läuft in %s Tag(en) ab.", "LDAP / AD integration" : "LDAP / AD Integration", "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"], "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"], diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json index d4ee92b54d6..bd6b2dcc0d2 100644 --- a/apps/user_ldap/l10n/de.json +++ b/apps/user_ldap/l10n/de.json @@ -54,7 +54,6 @@ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Das Gruppenfeld wurde deaktiviert, da der LDAP / AD-Server memberOf nicht unterstützt.", "Password change rejected. Hint: " : "Passwortändertung verweigert. Hinweis:", "Please login with the new password" : "Bitte mit dem neuen Passwort anmelden", - "Your password will expire within %s day(s)." : "Dein Passwort läuft in %s Tag(en) ab.", "LDAP / AD integration" : "LDAP / AD Integration", "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"], "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"], diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index 54e8647ecec..768fa8b17d0 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -56,7 +56,6 @@ OC.L10N.register( "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Das Gruppenfeld wurde deaktiviert, da der LDAP / AD-Server memberOf nicht unterstützt.", "Password change rejected. Hint: " : "Passwortändertung verweigert. Hinweis:", "Please login with the new password" : "Bitte mit dem neuen Passwort anmelden", - "Your password will expire within %s day(s)." : "Ihr Passwort läuft in %s Tag(en) ab.", "LDAP / AD integration" : "LDAP/AD-Integration", "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"], "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"], diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index 8108453ef58..04c83419dd3 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -54,7 +54,6 @@ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Das Gruppenfeld wurde deaktiviert, da der LDAP / AD-Server memberOf nicht unterstützt.", "Password change rejected. Hint: " : "Passwortändertung verweigert. Hinweis:", "Please login with the new password" : "Bitte mit dem neuen Passwort anmelden", - "Your password will expire within %s day(s)." : "Ihr Passwort läuft in %s Tag(en) ab.", "LDAP / AD integration" : "LDAP/AD-Integration", "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"], "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"], diff --git a/apps/user_ldap/l10n/es_MX.js b/apps/user_ldap/l10n/es_MX.js index 6c1fdcd0143..e0a8aecb939 100644 --- a/apps/user_ldap/l10n/es_MX.js +++ b/apps/user_ldap/l10n/es_MX.js @@ -12,6 +12,7 @@ OC.L10N.register( "No data specified" : "No se han especificado datos", " Could not set configuration %s" : "No fue posible establecer la configuración %s", "Action does not exist" : "La acción no existe", + "LDAP user and group backend" : "Backend de LDAP para usuario y grupo", "Renewing …" : "Renovando ...", "Very weak password" : "Contraseña muy debil", "Weak password" : "Contraseña debill", @@ -55,7 +56,6 @@ OC.L10N.register( "The group box was disabled, because the LDAP / AD server does not support memberOf." : "El cuadro de grupo está deshabilitado, porque el servidor LDAP / AD no soporta memberOf.", "Password change rejected. Hint: " : "Cambio de contraseña rechazado. Pista: ", "Please login with the new password" : "Favor de iniciar sesion con la nueva contraseña", - "Your password will expire within %s day(s)." : "Su contraseña expirará dentro de %s día(s).", "LDAP / AD integration" : "Integración con LDAP / AD", "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","%s grupos encontrados"], "_%s user found_::_%s users found_" : ["Usuario %s encontrado","%s usuarios encontrados"], @@ -163,6 +163,8 @@ OC.L10N.register( "Enable LDAP password changes per user" : "Habilitar cambio de contraseñas en LDAP por el usuario", "Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server." : "Permitir que los usuarios LDAP puedan cambiar su contraseña y permitir a los Super Administradortes y Administradores de grupo cambiar la contraseña de sus usuarios LDAP. Únicamente funciona si configuración de las poiíticas de control de acceso en el servidor LDAP está alineada. Como las contraseñas son enviadas en texto plano al servidor LDAP, se debe usar encripción en el transporte y del mismo modo se debe configurar el uso de funciones de resumen en el servidor LDAP", "(New password is sent as plain text to LDAP)" : "(La nueva contraseña se envía como texto plano a LDAP)", + "Default password policy DN" : "DN de la política predeterminada de contraseñas", + "The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling." : "El DN de la política de contraseñas predeterminada que será usada para el manejo de expiración de contraseñas. Solo funciona cuando está habilitado el cambio de contraseñas por el usuario y solo está soportado para OpenLDAP. Deje en blanco para deshabilitar el manejo de expiración de contraseñas.", "Special Attributes" : "Atributos Especiales", "Quota Field" : "Campo de cuota", "Leave empty for user's default quota. Otherwise, specify an LDAP/AD attribute." : "Dejar en blanco para usar la cuota predeterminada del usuario. En caso contrario, favor de especificar el atributo LDAP / AD.", diff --git a/apps/user_ldap/l10n/es_MX.json b/apps/user_ldap/l10n/es_MX.json index 6c82def13dc..5478beea589 100644 --- a/apps/user_ldap/l10n/es_MX.json +++ b/apps/user_ldap/l10n/es_MX.json @@ -10,6 +10,7 @@ "No data specified" : "No se han especificado datos", " Could not set configuration %s" : "No fue posible establecer la configuración %s", "Action does not exist" : "La acción no existe", + "LDAP user and group backend" : "Backend de LDAP para usuario y grupo", "Renewing …" : "Renovando ...", "Very weak password" : "Contraseña muy debil", "Weak password" : "Contraseña debill", @@ -53,7 +54,6 @@ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "El cuadro de grupo está deshabilitado, porque el servidor LDAP / AD no soporta memberOf.", "Password change rejected. Hint: " : "Cambio de contraseña rechazado. Pista: ", "Please login with the new password" : "Favor de iniciar sesion con la nueva contraseña", - "Your password will expire within %s day(s)." : "Su contraseña expirará dentro de %s día(s).", "LDAP / AD integration" : "Integración con LDAP / AD", "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","%s grupos encontrados"], "_%s user found_::_%s users found_" : ["Usuario %s encontrado","%s usuarios encontrados"], @@ -161,6 +161,8 @@ "Enable LDAP password changes per user" : "Habilitar cambio de contraseñas en LDAP por el usuario", "Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server." : "Permitir que los usuarios LDAP puedan cambiar su contraseña y permitir a los Super Administradortes y Administradores de grupo cambiar la contraseña de sus usuarios LDAP. Únicamente funciona si configuración de las poiíticas de control de acceso en el servidor LDAP está alineada. Como las contraseñas son enviadas en texto plano al servidor LDAP, se debe usar encripción en el transporte y del mismo modo se debe configurar el uso de funciones de resumen en el servidor LDAP", "(New password is sent as plain text to LDAP)" : "(La nueva contraseña se envía como texto plano a LDAP)", + "Default password policy DN" : "DN de la política predeterminada de contraseñas", + "The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling." : "El DN de la política de contraseñas predeterminada que será usada para el manejo de expiración de contraseñas. Solo funciona cuando está habilitado el cambio de contraseñas por el usuario y solo está soportado para OpenLDAP. Deje en blanco para deshabilitar el manejo de expiración de contraseñas.", "Special Attributes" : "Atributos Especiales", "Quota Field" : "Campo de cuota", "Leave empty for user's default quota. Otherwise, specify an LDAP/AD attribute." : "Dejar en blanco para usar la cuota predeterminada del usuario. En caso contrario, favor de especificar el atributo LDAP / AD.", diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js index aea2afe9a16..efb8574d47b 100644 --- a/apps/user_ldap/l10n/fr.js +++ b/apps/user_ldap/l10n/fr.js @@ -55,7 +55,6 @@ OC.L10N.register( "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Les groupes sont désactivés car le serveur LDAP / AD ne prend pas en charge memberOf.", "Password change rejected. Hint: " : "La modification du mot de passe a été rejetée. Indice :", "Please login with the new password" : "Veuillez vous connecter avec le nouveau mot de passe", - "Your password will expire within %s day(s)." : "Votre mot de passe va expirer dans %s jour(s).", "LDAP / AD integration" : "Intégration LDAP/AD", "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"], "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"], diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json index b396d11f106..24abea6f372 100644 --- a/apps/user_ldap/l10n/fr.json +++ b/apps/user_ldap/l10n/fr.json @@ -53,7 +53,6 @@ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Les groupes sont désactivés car le serveur LDAP / AD ne prend pas en charge memberOf.", "Password change rejected. Hint: " : "La modification du mot de passe a été rejetée. Indice :", "Please login with the new password" : "Veuillez vous connecter avec le nouveau mot de passe", - "Your password will expire within %s day(s)." : "Votre mot de passe va expirer dans %s jour(s).", "LDAP / AD integration" : "Intégration LDAP/AD", "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"], "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"], diff --git a/apps/user_ldap/l10n/nb.js b/apps/user_ldap/l10n/nb.js index 5d470f02fc0..06921ce04e0 100644 --- a/apps/user_ldap/l10n/nb.js +++ b/apps/user_ldap/l10n/nb.js @@ -54,7 +54,6 @@ OC.L10N.register( "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Gruppeboksen ble deaktivert fordi LDAP- / AD-tjeneren ikke støtter memberOf.", "Password change rejected. Hint: " : "Passordendring avslått. Hint:", "Please login with the new password" : "Logg inn med det nye passordet", - "Your password will expire within %s day(s)." : "Passordet ditt vil utløpe innen %s dag(er).", "LDAP / AD integration" : "LDAP / AD integrasjon", "_%s group found_::_%s groups found_" : ["%s gruppe funnet","%s grupper funnet"], "_%s user found_::_%s users found_" : ["%s bruker funnet","%s brukere funnet"], diff --git a/apps/user_ldap/l10n/nb.json b/apps/user_ldap/l10n/nb.json index 7da50250c38..2520aa42bff 100644 --- a/apps/user_ldap/l10n/nb.json +++ b/apps/user_ldap/l10n/nb.json @@ -52,7 +52,6 @@ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Gruppeboksen ble deaktivert fordi LDAP- / AD-tjeneren ikke støtter memberOf.", "Password change rejected. Hint: " : "Passordendring avslått. Hint:", "Please login with the new password" : "Logg inn med det nye passordet", - "Your password will expire within %s day(s)." : "Passordet ditt vil utløpe innen %s dag(er).", "LDAP / AD integration" : "LDAP / AD integrasjon", "_%s group found_::_%s groups found_" : ["%s gruppe funnet","%s grupper funnet"], "_%s user found_::_%s users found_" : ["%s bruker funnet","%s brukere funnet"], diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js index 08042e96ba1..612067d9718 100644 --- a/apps/user_ldap/l10n/nl.js +++ b/apps/user_ldap/l10n/nl.js @@ -12,6 +12,13 @@ OC.L10N.register( "No data specified" : "Geen gegevens verstrekt", " Could not set configuration %s" : "Kon configuratie %s niet instellen", "Action does not exist" : "Actie bestaat niet", + "LDAP user and group backend" : "LDAP gebruikers en groep backend", + "Renewing …" : "Herstellen ...", + "Very weak password" : "Zeer zwak wachtwoord", + "Weak password" : "Zwak wachtwoord", + "So-so password" : "Matig wachtwoord", + "Good password" : "Goed wachtwoord", + "Strong password" : "Sterk wachtwoord", "The Base DN appears to be wrong" : "De Basis DN lijkt onjuist", "Testing configuration…" : "Testen van de configuratie…", "Configuration incorrect" : "Configuratie onjuist", @@ -48,6 +55,7 @@ OC.L10N.register( "Please provide a login name to test against" : "Geef een inlognaam op om opnieuw tegen te testen", "The group box was disabled, because the LDAP / AD server does not support memberOf." : "De groepsbox was uitgeschakeld, omdat de LDAP / AD server het attribuut memberOf niet ondersteunt.", "Password change rejected. Hint: " : "Wachtwoordwijziging geweigerd. Hint:", + "Please login with the new password" : "Login met je nieuwe wachtwoord", "LDAP / AD integration" : "LDAP / AD integratie", "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"], "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"], @@ -101,6 +109,15 @@ OC.L10N.register( "Saving" : "Opslaan", "Back" : "Terug", "Continue" : "Verder", + "Please renew your password." : "Herstel je wachtwoord", + "An internal error occurred." : "Er heeft zich een interne fout voorgedaan.", + "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met je beheerder.", + "Current password" : "Huidig wachtwoord", + "New password" : "Nieuw wachtwoord", + "Renew password" : "Herstel wachtwoord", + "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?", + "Wrong password." : "Onjuist wachtwoord.", + "Cancel" : "Annuleren", "LDAP" : "LDAP", "Server" : "Server", "Users" : "Gebruikers", @@ -146,6 +163,8 @@ OC.L10N.register( "Enable LDAP password changes per user" : "Activeren LDAP wachtwoordwijziging per gebruiker:", "Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server." : "Sta LDAP gebruikers toe om hun wachtwoord te wijzigen en sta Superbeheerders en Groepsbeheerder toe om het wachtwoord van hun LDAP gebruikers te wijzigen. Dit werkt alleen als het toegangsbeveiligingsbeleid als zodanig ook op de LDAP server is ingericht. Omdat wachtwoorden in leesbare tekst naar de LDAP worden verstuurd, moet transportversleuteling worden gebruikt en moet wachtwoord hashing zijn geconfigureerd op de LDAP server.", "(New password is sent as plain text to LDAP)" : "(Nieuw wachtwoord is als leesbare tekst verstuurd naar LDAP)", + "Default password policy DN" : "Standaard wachtwoordbeleid DN", + "The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling." : "Het DN of standaard wachtwoordbeleid dat wordt gebruikt voor het verlopen van wachtwoorden. Wordt alleen ondersteund in combinaite met OpenLDAP wanneer paswoord wijzigingen per gebruiker is ingeschakeld. Leeg laten wanneer wanneer je wachtwoord verloop wil uitschakelen.", "Special Attributes" : "Speciale attributen", "Quota Field" : "Quota veld", "Leave empty for user's default quota. Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor het standaard gebruikersquotum. Of specificeer een LDAP/AD attribuut.", diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json index 418a99aaeb8..0b69b45fabe 100644 --- a/apps/user_ldap/l10n/nl.json +++ b/apps/user_ldap/l10n/nl.json @@ -10,6 +10,13 @@ "No data specified" : "Geen gegevens verstrekt", " Could not set configuration %s" : "Kon configuratie %s niet instellen", "Action does not exist" : "Actie bestaat niet", + "LDAP user and group backend" : "LDAP gebruikers en groep backend", + "Renewing …" : "Herstellen ...", + "Very weak password" : "Zeer zwak wachtwoord", + "Weak password" : "Zwak wachtwoord", + "So-so password" : "Matig wachtwoord", + "Good password" : "Goed wachtwoord", + "Strong password" : "Sterk wachtwoord", "The Base DN appears to be wrong" : "De Basis DN lijkt onjuist", "Testing configuration…" : "Testen van de configuratie…", "Configuration incorrect" : "Configuratie onjuist", @@ -46,6 +53,7 @@ "Please provide a login name to test against" : "Geef een inlognaam op om opnieuw tegen te testen", "The group box was disabled, because the LDAP / AD server does not support memberOf." : "De groepsbox was uitgeschakeld, omdat de LDAP / AD server het attribuut memberOf niet ondersteunt.", "Password change rejected. Hint: " : "Wachtwoordwijziging geweigerd. Hint:", + "Please login with the new password" : "Login met je nieuwe wachtwoord", "LDAP / AD integration" : "LDAP / AD integratie", "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"], "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"], @@ -99,6 +107,15 @@ "Saving" : "Opslaan", "Back" : "Terug", "Continue" : "Verder", + "Please renew your password." : "Herstel je wachtwoord", + "An internal error occurred." : "Er heeft zich een interne fout voorgedaan.", + "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met je beheerder.", + "Current password" : "Huidig wachtwoord", + "New password" : "Nieuw wachtwoord", + "Renew password" : "Herstel wachtwoord", + "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?", + "Wrong password." : "Onjuist wachtwoord.", + "Cancel" : "Annuleren", "LDAP" : "LDAP", "Server" : "Server", "Users" : "Gebruikers", @@ -144,6 +161,8 @@ "Enable LDAP password changes per user" : "Activeren LDAP wachtwoordwijziging per gebruiker:", "Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server." : "Sta LDAP gebruikers toe om hun wachtwoord te wijzigen en sta Superbeheerders en Groepsbeheerder toe om het wachtwoord van hun LDAP gebruikers te wijzigen. Dit werkt alleen als het toegangsbeveiligingsbeleid als zodanig ook op de LDAP server is ingericht. Omdat wachtwoorden in leesbare tekst naar de LDAP worden verstuurd, moet transportversleuteling worden gebruikt en moet wachtwoord hashing zijn geconfigureerd op de LDAP server.", "(New password is sent as plain text to LDAP)" : "(Nieuw wachtwoord is als leesbare tekst verstuurd naar LDAP)", + "Default password policy DN" : "Standaard wachtwoordbeleid DN", + "The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling." : "Het DN of standaard wachtwoordbeleid dat wordt gebruikt voor het verlopen van wachtwoorden. Wordt alleen ondersteund in combinaite met OpenLDAP wanneer paswoord wijzigingen per gebruiker is ingeschakeld. Leeg laten wanneer wanneer je wachtwoord verloop wil uitschakelen.", "Special Attributes" : "Speciale attributen", "Quota Field" : "Quota veld", "Leave empty for user's default quota. Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor het standaard gebruikersquotum. Of specificeer een LDAP/AD attribuut.", diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js index c60862a804d..da601d77b39 100644 --- a/apps/user_ldap/l10n/pt_BR.js +++ b/apps/user_ldap/l10n/pt_BR.js @@ -56,7 +56,6 @@ OC.L10N.register( "The group box was disabled, because the LDAP / AD server does not support memberOf." : "A caixa do grupo foi desativada pois o servidor LDAP / AD não suporta memberOf.", "Password change rejected. Hint: " : "Troca de senha rejeitada. Dica:", "Please login with the new password" : "Logue-se com a nova senha", - "Your password will expire within %s day(s)." : "Sua senha vai expirar dentro de %s dia(s).", "LDAP / AD integration" : "Integração LDAP / AD", "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"], "_%s user found_::_%s users found_" : ["usuário %s encontrado","%s usuários encontrados"], diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json index fb01a1d2224..f4026252ff7 100644 --- a/apps/user_ldap/l10n/pt_BR.json +++ b/apps/user_ldap/l10n/pt_BR.json @@ -54,7 +54,6 @@ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "A caixa do grupo foi desativada pois o servidor LDAP / AD não suporta memberOf.", "Password change rejected. Hint: " : "Troca de senha rejeitada. Dica:", "Please login with the new password" : "Logue-se com a nova senha", - "Your password will expire within %s day(s)." : "Sua senha vai expirar dentro de %s dia(s).", "LDAP / AD integration" : "Integração LDAP / AD", "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"], "_%s user found_::_%s users found_" : ["usuário %s encontrado","%s usuários encontrados"], diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js index a571f68dffe..036f78ea9b3 100644 --- a/apps/user_ldap/l10n/ru.js +++ b/apps/user_ldap/l10n/ru.js @@ -56,7 +56,6 @@ OC.L10N.register( "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Настройка групп была отключена, так как сервер LDAP / AD не поддерживает memberOf.", "Password change rejected. Hint: " : "Смена пароля отклонена. Подсказка:", "Please login with the new password" : "Войдите в систему со своим новым паролем", - "Your password will expire within %s day(s)." : "Срок действия пароля истечёт через %s дней (дня).", "LDAP / AD integration" : "Интеграция LDAP / AD", "_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено","%s групп найдено"], "_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено","%s пользователей найдено"], diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json index a84f416273c..0b61ca441cd 100644 --- a/apps/user_ldap/l10n/ru.json +++ b/apps/user_ldap/l10n/ru.json @@ -54,7 +54,6 @@ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Настройка групп была отключена, так как сервер LDAP / AD не поддерживает memberOf.", "Password change rejected. Hint: " : "Смена пароля отклонена. Подсказка:", "Please login with the new password" : "Войдите в систему со своим новым паролем", - "Your password will expire within %s day(s)." : "Срок действия пароля истечёт через %s дней (дня).", "LDAP / AD integration" : "Интеграция LDAP / AD", "_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено","%s групп найдено"], "_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено","%s пользователей найдено"], diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js index cc41ed59a3a..6686bfd7f14 100644 --- a/apps/user_ldap/l10n/tr.js +++ b/apps/user_ldap/l10n/tr.js @@ -56,7 +56,6 @@ OC.L10N.register( "The group box was disabled, because the LDAP / AD server does not support memberOf." : "LDAP / AD sunucusu memberOf parametresini desteklemediğinden grup kutusu devre dışı.", "Password change rejected. Hint: " : "Parola değişimi reddedildi. İpucu:", "Please login with the new password" : "Lütfen yeni parolanız ile oturum açın", - "Your password will expire within %s day(s)." : "Parolanızın süresi %s gün içinde dolacak.", "LDAP / AD integration" : "LDAP / AD bütünleştirmesi", "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"], "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"], diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json index b58444d4da6..691794be037 100644 --- a/apps/user_ldap/l10n/tr.json +++ b/apps/user_ldap/l10n/tr.json @@ -54,7 +54,6 @@ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "LDAP / AD sunucusu memberOf parametresini desteklemediğinden grup kutusu devre dışı.", "Password change rejected. Hint: " : "Parola değişimi reddedildi. İpucu:", "Please login with the new password" : "Lütfen yeni parolanız ile oturum açın", - "Your password will expire within %s day(s)." : "Parolanızın süresi %s gün içinde dolacak.", "LDAP / AD integration" : "LDAP / AD bütünleştirmesi", "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"], "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"], diff --git a/apps/user_ldap/lib/Notification/Notifier.php b/apps/user_ldap/lib/Notification/Notifier.php index a6053cfcb19..0099d764f03 100644 --- a/apps/user_ldap/lib/Notification/Notifier.php +++ b/apps/user_ldap/lib/Notification/Notifier.php @@ -60,7 +60,19 @@ class Notifier implements INotifier { switch ($notification->getSubject()) { // Deal with known subjects case 'pwd_exp_warn_days': - $notification->setParsedSubject($l->t('Your password will expire within %s day(s).', $notification->getSubjectParameters())); + $params = $notification->getSubjectParameters(); + $days = (int) $params[0]; + if ($days === 2) { + $notification->setParsedSubject($l->t('Your password will expire tomorrow.', $days)); + } else if ($days === 1) { + $notification->setParsedSubject($l->t('Your password will expire today.', $days)); + } else { + $notification->setParsedSubject($l->n( + 'Your password will expire within %n day.', + 'Your password will expire within %n days.', + $days + )); + } return $notification; default: diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php index a9e7eb6cc0c..5017f35ed0a 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -683,7 +683,7 @@ class User { ->setUser($uid) ->setDateTime($currentDateTime) ->setObject('pwd_exp_warn', $uid) - ->setSubject('pwd_exp_warn_days', [strval(ceil($secondsToExpiry / 60 / 60 / 24))]) + ->setSubject('pwd_exp_warn_days', [(int) ceil($secondsToExpiry / 60 / 60 / 24)]) ; $this->notificationManager->notify($notification); } diff --git a/apps/workflowengine/l10n/is.js b/apps/workflowengine/l10n/is.js index 941ba0273b1..bd58e51965c 100644 --- a/apps/workflowengine/l10n/is.js +++ b/apps/workflowengine/l10n/is.js @@ -1,7 +1,9 @@ OC.L10N.register( "workflowengine", { + "Saved" : "Vistað", "Saving failed:" : "Vistun mistókst:", + "File MIME type" : "MIME-skráartegund", "is" : "er", "is not" : "er ekki", "matches" : "samsvarar", diff --git a/apps/workflowengine/l10n/is.json b/apps/workflowengine/l10n/is.json index aedebea56a1..3dd3ee9304b 100644 --- a/apps/workflowengine/l10n/is.json +++ b/apps/workflowengine/l10n/is.json @@ -1,5 +1,7 @@ { "translations": { + "Saved" : "Vistað", "Saving failed:" : "Vistun mistókst:", + "File MIME type" : "MIME-skráartegund", "is" : "er", "is not" : "er ekki", "matches" : "samsvarar", diff --git a/apps/workflowengine/templates/admin.php b/apps/workflowengine/templates/admin.php index 500300f93b3..4f4dab4043f 100644 --- a/apps/workflowengine/templates/admin.php +++ b/apps/workflowengine/templates/admin.php @@ -24,7 +24,6 @@ ?> <div id="<?php p($_['appid']); ?>" class="section workflowengine"> <h2 class="inlineblock"><?php p($_['heading']); ?></h2> - <?php if (!empty($_['docs'])): ?> <a target="_blank" rel="noreferrer" class="icon-info svg" title="<?php p($l->t('Open documentation'));?>" @@ -32,6 +31,10 @@ </a> <?php endif; ?> + <?php if (!empty($_['settings-hint'])): ?> + <p class="settings-hint"><?php p($_['settings-hint']); ?></p> + <?php endif; ?> + <?php if (!empty($_['description'])): ?> <p><?php p($_['description']); ?></p> <?php endif; ?> |