diff options
| author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-14 19:50:52 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-14 19:50:52 +0100 |
| commit | 35d4851af2733515a1c81d4c0b78c4c14bf570e6 (patch) | |
| tree | 7adde58609d8de5d7b64774f4339cdc4dd0c7449 /apps/files_sharing | |
| parent | 227868fe168529a638dcf2dbff4ff8f44cadc519 (diff) | |
| parent | fb9e75edb6d01729a27c84f6f11399a1b0fde9f3 (diff) | |
| download | nextcloud-server-35d4851af2733515a1c81d4c0b78c4c14bf570e6.tar.gz nextcloud-server-35d4851af2733515a1c81d4c0b78c4c14bf570e6.zip | |
Merge branch 'master' into fix-app-disable-route
Diffstat (limited to 'apps/files_sharing')
71 files changed, 327 insertions, 29 deletions
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php index d26a64d3aec..66cfd8e9d1a 100644 --- a/apps/files_sharing/ajax/external.php +++ b/apps/files_sharing/ajax/external.php @@ -52,6 +52,7 @@ $externalManager = new \OCA\Files_Sharing\External\Manager( \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), \OC::$server->getHTTPHelper(), + \OC::$server->getNotificationManager(), \OC::$server->getUserSession()->getUser()->getUID() ); diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/api/remote.php index f6cb0a29d8b..0f6d2dc265a 100644 --- a/apps/files_sharing/api/remote.php +++ b/apps/files_sharing/api/remote.php @@ -38,6 +38,7 @@ class Remote { Filesystem::getMountManager(), Filesystem::getLoader(), \OC::$server->getHTTPHelper(), + \OC::$server->getNotificationManager(), \OC_User::getUser() ); @@ -56,6 +57,7 @@ class Remote { Filesystem::getMountManager(), Filesystem::getLoader(), \OC::$server->getHTTPHelper(), + \OC::$server->getNotificationManager(), \OC_User::getUser() ); @@ -78,6 +80,7 @@ class Remote { Filesystem::getMountManager(), Filesystem::getLoader(), \OC::$server->getHTTPHelper(), + \OC::$server->getNotificationManager(), \OC_User::getUser() ); @@ -87,5 +90,4 @@ class Remote { return new \OC_OCS_Result(null, 404, "wrong share ID, share doesn't exist."); } - } diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php index 4328e3830ba..6ecaea20535 100644 --- a/apps/files_sharing/api/server2server.php +++ b/apps/files_sharing/api/server2server.php @@ -70,6 +70,7 @@ class Server2Server { \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), \OC::$server->getHTTPHelper(), + \OC::$server->getNotificationManager(), $shareWith ); @@ -82,6 +83,28 @@ class Server2Server { Activity::FILES_SHARING_APP, Activity::SUBJECT_REMOTE_SHARE_RECEIVED, array($user, trim($name, '/')), '', array(), '', '', $shareWith, Activity::TYPE_REMOTE_SHARE, Activity::PRIORITY_LOW); + $urlGenerator = \OC::$server->getURLGenerator(); + + $notificationManager = \OC::$server->getNotificationManager(); + $notification = $notificationManager->createNotification(); + $notification->setApp('files_sharing') + ->setUser($shareWith) + ->setTimestamp(time()) + ->setObject('remote_share', $remoteId) + ->setSubject('remote_share', [$user, trim($name, '/')]); + + $acceptAction = $notification->createAction(); + $acceptAction->setLabel('accept') + ->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/' . $remoteId), 'POST'); + $declineAction = $notification->createAction(); + $declineAction->setLabel('decline') + ->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/' . $remoteId), 'DELETE'); + + $notification->addAction($acceptAction) + ->addAction($declineAction); + + $notificationManager->notify($notification); + return new \OC_OCS_Result(); } catch (\Exception $e) { \OCP\Util::writeLog('files_sharing', 'server can not add remote share, ' . $e->getMessage(), \OCP\Util::ERROR); diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 295d013beff..20f1b046d35 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -103,3 +103,10 @@ if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') { } } } + +$manager = \OC::$server->getNotificationManager(); +$manager->registerNotifier(function() { + return new \OCA\Files_Sharing\Notifier( + \OC::$server->getL10NFactory() + ); +}); diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php index 530195c65fa..d0dcadb77e8 100644 --- a/apps/files_sharing/appinfo/application.php +++ b/apps/files_sharing/appinfo/application.php @@ -93,6 +93,7 @@ class Application extends App { \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), $server->getHTTPHelper(), + $server->getNotificationManager(), $uid ); }); diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index 551a6ef4a00..bb8480e2a35 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s", "You shared %1$s via link" : "Sdílíte %1$s přes odkaz", "Shares" : "Sdílení", + "You received %s as a remote share from %s" : "Obdrželi jste %s nově nasdílená vzdáleně od %s ", + "Accept" : "Přijmout", + "Decline" : "Zamítnout", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s", "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID", "This share is password-protected" : "Toto sdílení je chráněno heslem", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "Sdružený cloud", "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", "Share it:" : "Sdílet:", + "Add to your website" : "Přidat na svou webovou stránku", "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", "HTML Code:" : "HTML kód:" }, diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index 065ab460158..677e982b6b0 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s", "You shared %1$s via link" : "Sdílíte %1$s přes odkaz", "Shares" : "Sdílení", + "You received %s as a remote share from %s" : "Obdrželi jste %s nově nasdílená vzdáleně od %s ", + "Accept" : "Přijmout", + "Decline" : "Zamítnout", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s", "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID", "This share is password-protected" : "Toto sdílení je chráněno heslem", @@ -64,6 +67,7 @@ "Federated Cloud" : "Sdružený cloud", "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", "Share it:" : "Sdílet:", + "Add to your website" : "Přidat na svou webovou stránku", "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", "HTML Code:" : "HTML kód:" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js index b08b09f4284..87595f6cc56 100644 --- a/apps/files_sharing/l10n/da.js +++ b/apps/files_sharing/l10n/da.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s delt %1$s med dig", "You shared %1$s via link" : "Du delte %1$s via link", "Shares" : "Delt", + "You received %s as a remote share from %s" : "Du modtog %s som et ekstern deling fra %s", + "Accept" : "Acceptér", + "Decline" : "Afvis", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s", "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID", "This share is password-protected" : "Delingen er beskyttet af kodeord", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Din Federated Cloud ID:", "Share it:" : "Del:", + "Add to your website" : "Tilføj til dit websted", "Share with me via ownCloud" : "Del med mig gennem ownCloud", "HTML Code:" : "HTMLkode:" }, diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json index 5cd51acafc6..c9ac959da2e 100644 --- a/apps/files_sharing/l10n/da.json +++ b/apps/files_sharing/l10n/da.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "%2$s delt %1$s med dig", "You shared %1$s via link" : "Du delte %1$s via link", "Shares" : "Delt", + "You received %s as a remote share from %s" : "Du modtog %s som et ekstern deling fra %s", + "Accept" : "Acceptér", + "Decline" : "Afvis", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s", "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID", "This share is password-protected" : "Delingen er beskyttet af kodeord", @@ -64,6 +67,7 @@ "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Din Federated Cloud ID:", "Share it:" : "Del:", + "Add to your website" : "Tilføj til dit websted", "Share with me via ownCloud" : "Del med mig gennem ownCloud", "HTML Code:" : "HTMLkode:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index afe6cae62eb..973aa0f15ac 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt", "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben", "Shares" : "Freigaben", + "Accept" : "Ok", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 17f2b6252b8..5526be3b6bf 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt", "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben", "Shares" : "Freigaben", + "Accept" : "Ok", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 395dbf4f295..47243b8f81d 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt", "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt", "Shares" : "Geteiltes", + "Accept" : "Akzeptieren", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 11b953b3bac..b63286de48d 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt", "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt", "Shares" : "Geteiltes", + "Accept" : "Akzeptieren", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js index a72abe23b7f..ef688424777 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς", "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου", "Shares" : "Κοινόχρηστοι φάκελοι", + "You received %s as a remote share from %s" : "Λάβατε το %s ως απομακρυσμένο διαμοιρασμό από %s", + "Accept" : "Αποδοχή", + "Decline" : "Απόρριψη", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "Federated σύννεφο", "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", "Share it:" : "Μοιραστείτε το:", + "Add to your website" : "Προσθήκη στην ιστοσελίδα σας", "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", "HTML Code:" : "Κώδικας HTML:" }, diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 7b2b9848a72..829ff61ceaa 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς", "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου", "Shares" : "Κοινόχρηστοι φάκελοι", + "You received %s as a remote share from %s" : "Λάβατε το %s ως απομακρυσμένο διαμοιρασμό από %s", + "Accept" : "Αποδοχή", + "Decline" : "Απόρριψη", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", @@ -64,6 +67,7 @@ "Federated Cloud" : "Federated σύννεφο", "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", "Share it:" : "Μοιραστείτε το:", + "Add to your website" : "Προσθήκη στην ιστοσελίδα σας", "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", "HTML Code:" : "Κώδικας HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js index 40f80be5b61..424fe743088 100644 --- a/apps/files_sharing/l10n/en_GB.js +++ b/apps/files_sharing/l10n/en_GB.js @@ -40,6 +40,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s shared %1$s with you", "You shared %1$s via link" : "You shared %1$s via link", "Shares" : "Shares", + "Accept" : "Accept", "This share is password-protected" : "This share is password-protected", "The password is wrong. Try again." : "The password is wrong. Try again.", "Password" : "Password", diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json index 5a70bee7212..4e41be946d1 100644 --- a/apps/files_sharing/l10n/en_GB.json +++ b/apps/files_sharing/l10n/en_GB.json @@ -38,6 +38,7 @@ "%2$s shared %1$s with you" : "%2$s shared %1$s with you", "You shared %1$s via link" : "You shared %1$s via link", "Shares" : "Shares", + "Accept" : "Accept", "This share is password-protected" : "This share is password-protected", "The password is wrong. Try again." : "The password is wrong. Try again.", "Password" : "Password", diff --git a/apps/files_sharing/l10n/eo.js b/apps/files_sharing/l10n/eo.js index 6c78d555304..ef900774146 100644 --- a/apps/files_sharing/l10n/eo.js +++ b/apps/files_sharing/l10n/eo.js @@ -23,6 +23,7 @@ OC.L10N.register( "You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s", "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi", "You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo", + "Accept" : "Akcepti", "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto", "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.", "Password" : "Pasvorto", diff --git a/apps/files_sharing/l10n/eo.json b/apps/files_sharing/l10n/eo.json index 8899e3021ca..cc648a7c60d 100644 --- a/apps/files_sharing/l10n/eo.json +++ b/apps/files_sharing/l10n/eo.json @@ -21,6 +21,7 @@ "You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s", "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi", "You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo", + "Accept" : "Akcepti", "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto", "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.", "Password" : "Pasvorto", diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index e094507d396..ca1e8c430db 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted", "You shared %1$s via link" : "Ha compartido %1$s vía enlace", "Shares" : "Compartidos", + "Accept" : "Aceptar", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s", "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud", "This share is password-protected" : "Este elemento compartido está protegido por contraseña", @@ -66,6 +67,7 @@ OC.L10N.register( "Federated Cloud" : "Nube Federada", "Your Federated Cloud ID:" : "Su ID Nube Federada:", "Share it:" : "Compartir:", + "Add to your website" : "Añadir a su Website", "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", "HTML Code:" : "Código HTML:" }, diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 48f1f22a1fd..4b300e1227f 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted", "You shared %1$s via link" : "Ha compartido %1$s vía enlace", "Shares" : "Compartidos", + "Accept" : "Aceptar", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s", "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud", "This share is password-protected" : "Este elemento compartido está protegido por contraseña", @@ -64,6 +65,7 @@ "Federated Cloud" : "Nube Federada", "Your Federated Cloud ID:" : "Su ID Nube Federada:", "Share it:" : "Compartir:", + "Add to your website" : "Añadir a su Website", "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js index a558a91896a..ada0a548162 100644 --- a/apps/files_sharing/l10n/et_EE.js +++ b/apps/files_sharing/l10n/et_EE.js @@ -4,13 +4,17 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "Serverist serverisse jagamine pole antud serveris lubatud", "The mountpoint name contains invalid characters." : "Ühenduspunkti nimes on vigaseid märke.", "Invalid or untrusted SSL certificate" : "Vigane või tundmatu SSL sertifikaat", + "Storage not valid" : "Andmehoidla pole korrektne", "Couldn't add remote share" : "Ei suutnud lisada kaugjagamist", "Shared with you" : "Sinuga jagatud", "Shared with others" : "Teistega jagatud", "Shared by link" : "Jagatud lingiga", "Nothing shared with you yet" : "Sinuga pole veel midagi jagatud", + "Files and folders others share with you will show up here" : "Siin näidatakse faile ja kaustasid, mida teised on sulle jaganud", "Nothing shared yet" : "Midagi pole veel jagatud", + "Files and folders you share will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa oled teistega jaganud", "No shared links" : "Jagatud linke pole", + "Files and folders you share by link will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa jagad lingiga", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?", "Remote share" : "Kaugjagamine", "Remote share password" : "Kaugjagamise parool", @@ -27,6 +31,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s", "You shared %1$s via link" : "Jagasid %1$s lingiga", "Shares" : "Jagamised", + "Accept" : "Nõustu", "This share is password-protected" : "See jagamine on parooliga kaitstud", "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.", "Password" : "Parool", diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json index 183f1707525..afa7fc6884d 100644 --- a/apps/files_sharing/l10n/et_EE.json +++ b/apps/files_sharing/l10n/et_EE.json @@ -2,13 +2,17 @@ "Server to server sharing is not enabled on this server" : "Serverist serverisse jagamine pole antud serveris lubatud", "The mountpoint name contains invalid characters." : "Ühenduspunkti nimes on vigaseid märke.", "Invalid or untrusted SSL certificate" : "Vigane või tundmatu SSL sertifikaat", + "Storage not valid" : "Andmehoidla pole korrektne", "Couldn't add remote share" : "Ei suutnud lisada kaugjagamist", "Shared with you" : "Sinuga jagatud", "Shared with others" : "Teistega jagatud", "Shared by link" : "Jagatud lingiga", "Nothing shared with you yet" : "Sinuga pole veel midagi jagatud", + "Files and folders others share with you will show up here" : "Siin näidatakse faile ja kaustasid, mida teised on sulle jaganud", "Nothing shared yet" : "Midagi pole veel jagatud", + "Files and folders you share will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa oled teistega jaganud", "No shared links" : "Jagatud linke pole", + "Files and folders you share by link will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa jagad lingiga", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?", "Remote share" : "Kaugjagamine", "Remote share password" : "Kaugjagamise parool", @@ -25,6 +29,7 @@ "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s", "You shared %1$s via link" : "Jagasid %1$s lingiga", "Shares" : "Jagamised", + "Accept" : "Nõustu", "This share is password-protected" : "See jagamine on parooliga kaitstud", "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.", "Password" : "Parool", diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js index 0de3dda9290..396c4785537 100644 --- a/apps/files_sharing/l10n/fi_FI.js +++ b/apps/files_sharing/l10n/fi_FI.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi", "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta", "Shares" : "Jaot", + "You received %s as a remote share from %s" : "Sait etäjaon %s käyttäjältä %s", + "Accept" : "Hyväksy", + "Decline" : "Kieltäydy", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s", "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", "This share is password-protected" : "Tämä jako on suojattu salasanalla", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "Federoitu pilvi", "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", "Share it:" : "Jaa se:", + "Add to your website" : "Lisää verkkosivuillesi", "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", "HTML Code:" : "HTML-koodi:" }, diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json index 80e353818cd..56d64c0e841 100644 --- a/apps/files_sharing/l10n/fi_FI.json +++ b/apps/files_sharing/l10n/fi_FI.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi", "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta", "Shares" : "Jaot", + "You received %s as a remote share from %s" : "Sait etäjaon %s käyttäjältä %s", + "Accept" : "Hyväksy", + "Decline" : "Kieltäydy", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s", "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", "This share is password-protected" : "Tämä jako on suojattu salasanalla", @@ -64,6 +67,7 @@ "Federated Cloud" : "Federoitu pilvi", "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", "Share it:" : "Jaa se:", + "Add to your website" : "Lisää verkkosivuillesi", "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", "HTML Code:" : "HTML-koodi:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index 077c12e6db2..a59409e008a 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous", "You shared %1$s via link" : "Vous avez partagé %1$s par lien public", "Shares" : "Partages", + "Accept" : "Accepter", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", "This share is password-protected" : "Ce partage est protégé par un mot de passe", @@ -66,6 +67,7 @@ OC.L10N.register( "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", "Share it:" : "Partager :", + "Add to your website" : "Ajouter à votre site web", "Share with me via ownCloud" : "Partagez avec moi via ownCloud", "HTML Code:" : "Code HTML :" }, diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index c4b3bbe2f72..0bb6f2b1b9e 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous", "You shared %1$s via link" : "Vous avez partagé %1$s par lien public", "Shares" : "Partages", + "Accept" : "Accepter", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", "This share is password-protected" : "Ce partage est protégé par un mot de passe", @@ -64,6 +65,7 @@ "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", "Share it:" : "Partager :", + "Add to your website" : "Ajouter à votre site web", "Share with me via ownCloud" : "Partagez avec moi via ownCloud", "HTML Code:" : "Code HTML :" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 44dfaa52de2..f2a2d528ffc 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede", "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón", "Shares" : "Comparticións", + "Accept" : "Aceptar", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Comparte comigo a través do meu ID da nube federada do #ownCloud , vexa %s", "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud", "This share is password-protected" : "Esta compartición está protexida con contrasinal", diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index a9109c5000c..b9998a47a12 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede", "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón", "Shares" : "Comparticións", + "Accept" : "Aceptar", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Comparte comigo a través do meu ID da nube federada do #ownCloud , vexa %s", "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud", "This share is password-protected" : "Esta compartición está protexida con contrasinal", diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js index 3278343a769..c78bdce652d 100644 --- a/apps/files_sharing/l10n/hu_HU.js +++ b/apps/files_sharing/l10n/hu_HU.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s", "You shared %1$s via link" : "Megosztottam link segítségével: %1$s", "Shares" : "Megosztások", + "Accept" : "Elfogadás", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s", "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ", "This share is password-protected" : "Ez egy jelszóval védett megosztás", @@ -66,6 +67,7 @@ OC.L10N.register( "Federated Cloud" : "Egyesített felhő", "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", "Share it:" : "Ossza meg:", + "Add to your website" : "Add hozzá saját weboldaladhoz", "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül", "HTML Code:" : "HTML Code:" }, diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json index edb98a5f70b..22cc1422eb7 100644 --- a/apps/files_sharing/l10n/hu_HU.json +++ b/apps/files_sharing/l10n/hu_HU.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s", "You shared %1$s via link" : "Megosztottam link segítségével: %1$s", "Shares" : "Megosztások", + "Accept" : "Elfogadás", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s", "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ", "This share is password-protected" : "Ez egy jelszóval védett megosztás", @@ -64,6 +65,7 @@ "Federated Cloud" : "Egyesített felhő", "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", "Share it:" : "Ossza meg:", + "Add to your website" : "Add hozzá saját weboldaladhoz", "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül", "HTML Code:" : "HTML Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js index 985b424e726..f0d9fc2aecb 100644 --- a/apps/files_sharing/l10n/id.js +++ b/apps/files_sharing/l10n/id.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda", "You shared %1$s via link" : "Anda membagikan %1$s via tautan", "Shares" : "Dibagikan", + "You received %s as a remote share from %s" : "Anda menerima %s sebagai berbagi remote dari %s", + "Accept" : "Terima", + "Decline" : "Tolak", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s", "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya", "This share is password-protected" : "Berbagi ini dilindungi sandi", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", "Share it:" : "Bagikan:", + "Add to your website" : "Tambahkan pada situs web Anda", "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud", "HTML Code:" : "Kode HTML:" }, diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json index 78f5d2352a7..b14f4c43789 100644 --- a/apps/files_sharing/l10n/id.json +++ b/apps/files_sharing/l10n/id.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda", "You shared %1$s via link" : "Anda membagikan %1$s via tautan", "Shares" : "Dibagikan", + "You received %s as a remote share from %s" : "Anda menerima %s sebagai berbagi remote dari %s", + "Accept" : "Terima", + "Decline" : "Tolak", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s", "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya", "This share is password-protected" : "Berbagi ini dilindungi sandi", @@ -64,6 +67,7 @@ "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", "Share it:" : "Bagikan:", + "Add to your website" : "Tambahkan pada situs web Anda", "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud", "HTML Code:" : "Kode HTML:" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index 0d8a315421f..9ddf9b5f385 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te", "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento", "Shares" : "Condivisioni", + "You received %s as a remote share from %s" : "Hai ricevuto %s come condivisione remota da %s", + "Accept" : "Accetta", + "Decline" : "Rifiuta", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s", "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", "This share is password-protected" : "Questa condivione è protetta da password", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "Cloud federata", "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", "Share it:" : "Condividilo:", + "Add to your website" : "Aggiungilo al tuo sito web", "Share with me via ownCloud" : "Condividi con me tramite ownCloud", "HTML Code:" : "Codice HTML:" }, diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index dd41b95eab7..2ff7f2d13b5 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te", "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento", "Shares" : "Condivisioni", + "You received %s as a remote share from %s" : "Hai ricevuto %s come condivisione remota da %s", + "Accept" : "Accetta", + "Decline" : "Rifiuta", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s", "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", "This share is password-protected" : "Questa condivione è protetta da password", @@ -64,6 +67,7 @@ "Federated Cloud" : "Cloud federata", "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", "Share it:" : "Condividilo:", + "Add to your website" : "Aggiungilo al tuo sito web", "Share with me via ownCloud" : "Condividi con me tramite ownCloud", "HTML Code:" : "Codice HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index 0fa2f3c8d0f..413f4a2ac8c 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました", "You shared %1$s via link" : "リンク経由で %1$s を共有しています", "Shares" : "共有", + "Accept" : "承諾", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s", "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。", "This share is password-protected" : "この共有はパスワードで保護されています", diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index 88b94fb5ed7..65d762871de 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました", "You shared %1$s via link" : "リンク経由で %1$s を共有しています", "Shares" : "共有", + "Accept" : "承諾", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s", "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。", "This share is password-protected" : "この共有はパスワードで保護されています", diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js index 646a57f7853..d750f827797 100644 --- a/apps/files_sharing/l10n/ko.js +++ b/apps/files_sharing/l10n/ko.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함", "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함", "Shares" : "공유", + "You received %s as a remote share from %s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다", + "Accept" : "수락", + "Decline" : "거절", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨", "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "연합 클라우드", "Your Federated Cloud ID:" : "내 연합 클라우드 ID:", "Share it:" : "공유하기:", + "Add to your website" : "내 웹 사이트에 추가", "Share with me via ownCloud" : "ownCloud로 나와 공유하기", "HTML Code:" : "HTML 코드:" }, diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json index 4d322770b1a..e9a169be4f7 100644 --- a/apps/files_sharing/l10n/ko.json +++ b/apps/files_sharing/l10n/ko.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함", "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함", "Shares" : "공유", + "You received %s as a remote share from %s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다", + "Accept" : "수락", + "Decline" : "거절", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨", "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다", @@ -64,6 +67,7 @@ "Federated Cloud" : "연합 클라우드", "Your Federated Cloud ID:" : "내 연합 클라우드 ID:", "Share it:" : "공유하기:", + "Add to your website" : "내 웹 사이트에 추가", "Share with me via ownCloud" : "ownCloud로 나와 공유하기", "HTML Code:" : "HTML 코드:" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js index 65b13acaf53..a83ce84d26d 100644 --- a/apps/files_sharing/l10n/nb_NO.js +++ b/apps/files_sharing/l10n/nb_NO.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s delte %1$s med deg", "You shared %1$s via link" : "Du delte %1$s via lenke", "Shares" : "Delinger", + "You received %s as a remote share from %s" : "Du mottok %s som en ekstern deling fra %s", + "Accept" : "Aksepter", + "Decline" : "Avslå", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s", "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky", "This share is password-protected" : "Denne delingen er passordbeskyttet", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "Sammenknyttet sky", "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", "Share it:" : "Del den:", + "Add to your website" : "Legg på websiden din", "Share with me via ownCloud" : "Del med meg via ownCloud", "HTML Code:" : "HTML-kode:" }, diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json index 4fe4ee008be..6eedd895f4f 100644 --- a/apps/files_sharing/l10n/nb_NO.json +++ b/apps/files_sharing/l10n/nb_NO.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "%2$s delte %1$s med deg", "You shared %1$s via link" : "Du delte %1$s via lenke", "Shares" : "Delinger", + "You received %s as a remote share from %s" : "Du mottok %s som en ekstern deling fra %s", + "Accept" : "Aksepter", + "Decline" : "Avslå", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s", "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky", "This share is password-protected" : "Denne delingen er passordbeskyttet", @@ -64,6 +67,7 @@ "Federated Cloud" : "Sammenknyttet sky", "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", "Share it:" : "Del den:", + "Add to your website" : "Legg på websiden din", "Share with me via ownCloud" : "Del med meg via ownCloud", "HTML Code:" : "HTML-kode:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index e20f0fd868d..7468819fda7 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s deelde %1$s met u", "You shared %1$s via link" : "U deelde %1$s via link", "Shares" : "Gedeeld", + "Accept" : "Accepteren", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", "This share is password-protected" : "Deze share is met een wachtwoord beveiligd", @@ -66,6 +67,7 @@ OC.L10N.register( "Federated Cloud" : "Gefedereerde Cloud", "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", "Share it:" : "Deel het:", + "Add to your website" : "Toevoegen aan uw website", "Share with me via ownCloud" : "Deel met mij via ownCloud", "HTML Code:" : "HTML Code:" }, diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index accdcefd74b..57df2d5c155 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s deelde %1$s met u", "You shared %1$s via link" : "U deelde %1$s via link", "Shares" : "Gedeeld", + "Accept" : "Accepteren", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", "This share is password-protected" : "Deze share is met een wachtwoord beveiligd", @@ -64,6 +65,7 @@ "Federated Cloud" : "Gefedereerde Cloud", "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", "Share it:" : "Deel het:", + "Add to your website" : "Toevoegen aan uw website", "Share with me via ownCloud" : "Deel met mij via ownCloud", "HTML Code:" : "HTML Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js index a0efb5ff607..62b128844df 100644 --- a/apps/files_sharing/l10n/pl.js +++ b/apps/files_sharing/l10n/pl.js @@ -30,6 +30,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą", "You shared %1$s via link" : "Udostępniasz %1$s przez link", "Shares" : "Udziały", + "Accept" : "Akceptuj", "This share is password-protected" : "Udział ten jest chroniony hasłem", "The password is wrong. Try again." : "To hasło jest niewłaściwe. Spróbuj ponownie.", "Password" : "Hasło", diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json index 6ffad562b7f..76052b1dfb7 100644 --- a/apps/files_sharing/l10n/pl.json +++ b/apps/files_sharing/l10n/pl.json @@ -28,6 +28,7 @@ "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą", "You shared %1$s via link" : "Udostępniasz %1$s przez link", "Shares" : "Udziały", + "Accept" : "Akceptuj", "This share is password-protected" : "Udział ten jest chroniony hasłem", "The password is wrong. Try again." : "To hasło jest niewłaściwe. Spróbuj ponownie.", "Password" : "Hasło", diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index 2f4e9e9e652..35c9f970000 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você", "You shared %1$s via link" : "Você compartilhou %1$s via link", "Shares" : "Compartilhamentos", + "You received %s as a remote share from %s" : "Você recebeu %s como um compartilhamento remoto de %s", + "Accept" : "Aceitar", + "Decline" : "Rejeitar", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s", "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID", "This share is password-protected" : "Este compartilhamento esta protegido por senha", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "Nuvem Conglomerada", "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:", "Share it:" : "Compartilhe:", + "Add to your website" : "Adicione ao seu website", "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", "HTML Code:" : "Código HTML:" }, diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index fd64260a419..ebb2a5a4cce 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você", "You shared %1$s via link" : "Você compartilhou %1$s via link", "Shares" : "Compartilhamentos", + "You received %s as a remote share from %s" : "Você recebeu %s como um compartilhamento remoto de %s", + "Accept" : "Aceitar", + "Decline" : "Rejeitar", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s", "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID", "This share is password-protected" : "Este compartilhamento esta protegido por senha", @@ -64,6 +67,7 @@ "Federated Cloud" : "Nuvem Conglomerada", "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:", "Share it:" : "Compartilhe:", + "Add to your website" : "Adicione ao seu website", "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js index 8e9afdd0626..dc501ebe048 100644 --- a/apps/files_sharing/l10n/pt_PT.js +++ b/apps/files_sharing/l10n/pt_PT.js @@ -4,41 +4,46 @@ OC.L10N.register( "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor", "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", - "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada", + "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada", "Storage not valid" : "Armazenamento inválido", "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", "Nothing shared with you yet" : "Ainda não foi partilhado nada consigo", - "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui", - "Nothing shared yet" : "Ainda não foi nada paratilhado", - "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui", + "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradaos aqui", + "Nothing shared yet" : "Ainda não foi partilhado nada", + "Files and folders you share will show up here" : "Os ficheiros e as pastas que partilha serão mostrados aqui", "No shared links" : "Sem hiperligações partilhadas", - "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui", + "Files and folders you share by link will show up here" : "Os ficheiros e as pastas que partilha com esta hiperligação, serão mostrados aqui", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?", "Remote share" : "Partilha remota", "Remote share password" : "Senha da partilha remota", "Cancel" : "Cancelar", "Add remote share" : "Adicionar partilha remota", - "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}", + "You can upload into this folder" : "Pode enviar para esta pasta", + "No ownCloud installation (7 or higher) found at {remote}" : "Não foi encontrada nenhuma instalação OwnCloud (7 ou superior) em {remote}", "Invalid ownCloud url" : "Url ownCloud inválido", "Shared by" : "Partilhado por", "Sharing" : "Partilha", "A file or folder has been <strong>shared</strong>" : "Foi <strong>partilhado</strong> um ficheiro ou uma pasta", "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>", - "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi <strong>descarregado</strong>", - "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s", + "A public shared file or folder was <strong>downloaded</strong>" : "Foi <strong>transferido</strong> um ficheiro ou pasta partilhada publicamente", + "You received a new remote share %2$s from %1$s" : "Recebeu uma nova partilha remota %2$s de %1$s", + "You received a new remote share from %s" : "Recebeu uma nova partilha remota de %s", "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s", "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s", - "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo", - "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada", - "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado", + "%1$s unshared %2$s from you" : "%1$s cancelou a partilha %2$s consigo", + "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi transferida", + "Public shared file %1$s was downloaded" : "Foi transferido o ficheiro %1$s partilhado publicamente", "You shared %1$s with %2$s" : "Partilhou %1$s com %2$s", "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s", "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo", "You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação", "Shares" : "Partilhas", + "Accept" : "Aceitar", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud", "This share is password-protected" : "Esta partilha está protegida por senha", "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.", "Password" : "Senha", @@ -55,10 +60,14 @@ OC.L10N.register( "Download" : "Transferir", "Download %s" : "Transferir %s", "Direct link" : "Hiperligação direta", - "Federated Cloud Sharing" : "Partilha de Cloud Federada", + "Federated Cloud Sharing" : "Partilha de Nuvem Federada", "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores", + "Federated Cloud" : "Nuvem Federada", + "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada", + "Share it:" : "Partilhe:", + "Add to your website" : "Adicione ao seu sítio da Web", "Share with me via ownCloud" : "Partilhe comigo via ownCloud", "HTML Code:" : "Código HTML:" }, diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json index 9a66c73a681..9c5bc14e610 100644 --- a/apps/files_sharing/l10n/pt_PT.json +++ b/apps/files_sharing/l10n/pt_PT.json @@ -2,41 +2,46 @@ "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor", "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", - "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada", + "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada", "Storage not valid" : "Armazenamento inválido", "Couldn't add remote share" : "Não foi possível adicionar a partilha remota", "Shared with you" : "Partilhado consigo ", "Shared with others" : "Partilhado com outros", "Shared by link" : "Partilhado pela hiperligação", "Nothing shared with you yet" : "Ainda não foi partilhado nada consigo", - "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui", - "Nothing shared yet" : "Ainda não foi nada paratilhado", - "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui", + "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradaos aqui", + "Nothing shared yet" : "Ainda não foi partilhado nada", + "Files and folders you share will show up here" : "Os ficheiros e as pastas que partilha serão mostrados aqui", "No shared links" : "Sem hiperligações partilhadas", - "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui", + "Files and folders you share by link will show up here" : "Os ficheiros e as pastas que partilha com esta hiperligação, serão mostrados aqui", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?", "Remote share" : "Partilha remota", "Remote share password" : "Senha da partilha remota", "Cancel" : "Cancelar", "Add remote share" : "Adicionar partilha remota", - "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}", + "You can upload into this folder" : "Pode enviar para esta pasta", + "No ownCloud installation (7 or higher) found at {remote}" : "Não foi encontrada nenhuma instalação OwnCloud (7 ou superior) em {remote}", "Invalid ownCloud url" : "Url ownCloud inválido", "Shared by" : "Partilhado por", "Sharing" : "Partilha", "A file or folder has been <strong>shared</strong>" : "Foi <strong>partilhado</strong> um ficheiro ou uma pasta", "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>", - "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi <strong>descarregado</strong>", - "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s", + "A public shared file or folder was <strong>downloaded</strong>" : "Foi <strong>transferido</strong> um ficheiro ou pasta partilhada publicamente", + "You received a new remote share %2$s from %1$s" : "Recebeu uma nova partilha remota %2$s de %1$s", + "You received a new remote share from %s" : "Recebeu uma nova partilha remota de %s", "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s", "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s", - "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo", - "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada", - "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado", + "%1$s unshared %2$s from you" : "%1$s cancelou a partilha %2$s consigo", + "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi transferida", + "Public shared file %1$s was downloaded" : "Foi transferido o ficheiro %1$s partilhado publicamente", "You shared %1$s with %2$s" : "Partilhou %1$s com %2$s", "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s", "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo", "You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação", "Shares" : "Partilhas", + "Accept" : "Aceitar", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud", "This share is password-protected" : "Esta partilha está protegida por senha", "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.", "Password" : "Senha", @@ -53,10 +58,14 @@ "Download" : "Transferir", "Download %s" : "Transferir %s", "Direct link" : "Hiperligação direta", - "Federated Cloud Sharing" : "Partilha de Cloud Federada", + "Federated Cloud Sharing" : "Partilha de Nuvem Federada", "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores", + "Federated Cloud" : "Nuvem Federada", + "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada", + "Share it:" : "Partilhe:", + "Add to your website" : "Adicione ao seu sítio da Web", "Share with me via ownCloud" : "Partilhe comigo via ownCloud", "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index 66ef69cac61..2d89b5e3102 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s", "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки", "Shares" : "События обмена файлами", + "Accept" : "Принять", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s", "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", "This share is password-protected" : "Общий ресурс защищен паролем", diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index e4fccaf0800..0f7a152f536 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s", "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки", "Shares" : "События обмена файлами", + "Accept" : "Принять", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s", "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", "This share is password-protected" : "Общий ресурс защищен паролем", diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js index e4ff1b4e1c5..677b4f24e21 100644 --- a/apps/files_sharing/l10n/sk_SK.js +++ b/apps/files_sharing/l10n/sk_SK.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s", "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu", "Shares" : "Zdieľanie", + "Accept" : "Schváliť", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s", "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID", "This share is password-protected" : "Toto zdieľanie je chránené heslom", diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json index ce516ae314c..f4f6cc3798b 100644 --- a/apps/files_sharing/l10n/sk_SK.json +++ b/apps/files_sharing/l10n/sk_SK.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s", "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu", "Shares" : "Zdieľanie", + "Accept" : "Schváliť", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s", "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID", "This share is password-protected" : "Toto zdieľanie je chránené heslom", diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index d613f169081..3b6622aedf2 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -39,6 +39,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s", "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave", "Shares" : "Souporaba", + "Accept" : "Sprejmi", "This share is password-protected" : "To mesto je zaščiteno z geslom.", "The password is wrong. Try again." : "Geslo je napačno. Poskusite znova.", "Password" : "Geslo", diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index fb00547388b..2d443de13d9 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -37,6 +37,7 @@ "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s", "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave", "Shares" : "Souporaba", + "Accept" : "Sprejmi", "This share is password-protected" : "To mesto je zaščiteno z geslom.", "The password is wrong. Try again." : "Geslo je napačno. Poskusite znova.", "Password" : "Geslo", diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js index 5676cc5a00c..ddb15bd2183 100644 --- a/apps/files_sharing/l10n/sr.js +++ b/apps/files_sharing/l10n/sr.js @@ -40,6 +40,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s подели %1$s са вама", "You shared %1$s via link" : "Поделили сте %1$s путем везе", "Shares" : "Дељења", + "Accept" : "Прихвати", "This share is password-protected" : "Дељење је заштићено лозинком", "The password is wrong. Try again." : "Лозинка је погрешна. Покушајте поново.", "Password" : "Лозинка", diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json index fca522a1039..dc44b1fbb60 100644 --- a/apps/files_sharing/l10n/sr.json +++ b/apps/files_sharing/l10n/sr.json @@ -38,6 +38,7 @@ "%2$s shared %1$s with you" : "%2$s подели %1$s са вама", "You shared %1$s via link" : "Поделили сте %1$s путем везе", "Shares" : "Дељења", + "Accept" : "Прихвати", "This share is password-protected" : "Дељење је заштићено лозинком", "The password is wrong. Try again." : "Лозинка је погрешна. Покушајте поново.", "Password" : "Лозинка", diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js index 77b1171d9b2..9b1d9ccb591 100644 --- a/apps/files_sharing/l10n/sv.js +++ b/apps/files_sharing/l10n/sv.js @@ -36,6 +36,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s delade %1$s med dig", "You shared %1$s via link" : "Du delade %1$s via länk", "Shares" : "Delningar", + "Accept" : "Acceptera", "This share is password-protected" : "Den här delningen är lösenordsskyddad", "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.", "Password" : "Lösenord", diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json index a8bb9afd01f..0d13069dfba 100644 --- a/apps/files_sharing/l10n/sv.json +++ b/apps/files_sharing/l10n/sv.json @@ -34,6 +34,7 @@ "%2$s shared %1$s with you" : "%2$s delade %1$s med dig", "You shared %1$s via link" : "Du delade %1$s via länk", "Shares" : "Delningar", + "Accept" : "Acceptera", "This share is password-protected" : "Den här delningen är lösenordsskyddad", "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.", "Password" : "Lösenord", diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js index be9a353ffd9..9db7c600102 100644 --- a/apps/files_sharing/l10n/th_TH.js +++ b/apps/files_sharing/l10n/th_TH.js @@ -41,6 +41,9 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ", "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์", "Shares" : "แชร์", + "You received %s as a remote share from %s" : "คุณได้รับ %s โดยรีโมทแชร์จาก %s", + "Accept" : "ยอมรับ", + "Decline" : "ลดลง", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s", "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ", "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน", @@ -66,6 +69,7 @@ OC.L10N.register( "Federated Cloud" : "สหพันธ์คลาวด์", "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", "Share it:" : "แชร์มัน:", + "Add to your website" : "เพิ่มไปยังเว็บไซต์", "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", "HTML Code:" : "โค้ด HTML:" }, diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json index 6984d7275d9..f630c062643 100644 --- a/apps/files_sharing/l10n/th_TH.json +++ b/apps/files_sharing/l10n/th_TH.json @@ -39,6 +39,9 @@ "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ", "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์", "Shares" : "แชร์", + "You received %s as a remote share from %s" : "คุณได้รับ %s โดยรีโมทแชร์จาก %s", + "Accept" : "ยอมรับ", + "Decline" : "ลดลง", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s", "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ", "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน", @@ -64,6 +67,7 @@ "Federated Cloud" : "สหพันธ์คลาวด์", "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", "Share it:" : "แชร์มัน:", + "Add to your website" : "เพิ่มไปยังเว็บไซต์", "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", "HTML Code:" : "โค้ด HTML:" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index 9e14e0187cd..bb00dd4295a 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -41,6 +41,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı", "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız", "Shares" : "Paylaşımlar", + "Accept" : "Kabul et", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s", "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı", "This share is password-protected" : "Bu paylaşım parola korumalı", diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index b11d5be2fd7..1371bf37447 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -39,6 +39,7 @@ "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı", "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız", "Shares" : "Paylaşımlar", + "Accept" : "Kabul et", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s", "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı", "This share is password-protected" : "Bu paylaşım parola korumalı", diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index c25dc92409f..377c9f02253 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -47,6 +47,7 @@ class Shared_Cache extends Cache { * @param \OC\Files\Storage\Shared $storage */ public function __construct($storage) { + parent::__construct($storage); $this->storage = $storage; } @@ -94,6 +95,7 @@ class Shared_Cache extends Cache { * @return array|false */ public function get($file) { + $mimetypeLoader = \OC::$server->getMimeTypeLoader(); if (is_string($file)) { $cache = $this->getSourceCache($file); if ($cache) { @@ -130,8 +132,8 @@ class Shared_Cache extends Cache { $data['mtime'] = (int)$data['mtime']; $data['storage_mtime'] = (int)$data['storage_mtime']; $data['encrypted'] = (bool)$data['encrypted']; - $data['mimetype'] = $this->getMimetype($data['mimetype']); - $data['mimepart'] = $this->getMimetype($data['mimepart']); + $data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']); + $data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']); if ($data['storage_mtime'] === 0) { $data['storage_mtime'] = $data['mtime']; } diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php index 67a26c096c2..17142e95099 100644 --- a/apps/files_sharing/lib/external/manager.php +++ b/apps/files_sharing/lib/external/manager.php @@ -28,6 +28,7 @@ namespace OCA\Files_Sharing\External; use OC\Files\Filesystem; use OCP\Files; +use OC\Notification\IManager; class Manager { const STORAGE = '\OCA\Files_Sharing\External\Storage'; @@ -58,19 +59,26 @@ class Manager { private $httpHelper; /** + * @var IManager + */ + private $notificationManager; + + /** * @param \OCP\IDBConnection $connection * @param \OC\Files\Mount\Manager $mountManager * @param \OCP\Files\Storage\IStorageFactory $storageLoader * @param \OC\HTTPHelper $httpHelper + * @param IManager $notificationManager * @param string $uid */ public function __construct(\OCP\IDBConnection $connection, \OC\Files\Mount\Manager $mountManager, - \OCP\Files\Storage\IStorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, $uid) { + \OCP\Files\Storage\IStorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, IManager $notificationManager, $uid) { $this->connection = $connection; $this->mountManager = $mountManager; $this->storageLoader = $storageLoader; $this->httpHelper = $httpHelper; $this->uid = $uid; + $this->notificationManager = $notificationManager; } /** @@ -206,6 +214,7 @@ class Manager { $acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid)); $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept'); + $this->scrapNotification($share['remote_id']); return true; } @@ -228,6 +237,7 @@ class Manager { $removeShare->execute(array($id, $this->uid)); $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline'); + $this->scrapNotification($share['remote_id']); return true; } @@ -235,6 +245,17 @@ class Manager { } /** + * @param int $remoteShare + */ + protected function scrapNotification($remoteShare) { + $filter = $this->notificationManager->createNotification(); + $filter->setApp('files_sharing') + ->setUser($this->uid) + ->setObject('remote_share', (int) $remoteShare); + $this->notificationManager->markProcessed($filter); + } + + /** * inform remote server whether server-to-server share was accepted/declined * * @param string $remote @@ -265,6 +286,7 @@ class Manager { \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), \OC::$server->getHTTPHelper(), + \OC::$server->getNotificationManager(), $params['user'] ); diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php index 7dd04f2f4a0..1937010f390 100644 --- a/apps/files_sharing/lib/hooks.php +++ b/apps/files_sharing/lib/hooks.php @@ -33,6 +33,7 @@ class Hooks { \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), \OC::$server->getHTTPHelper(), + \OC::$server->getNotificationManager(), $params['uid']); $manager->removeUserShares($params['uid']); diff --git a/apps/files_sharing/lib/notifier.php b/apps/files_sharing/lib/notifier.php new file mode 100644 index 00000000000..cc2deb3f439 --- /dev/null +++ b/apps/files_sharing/lib/notifier.php @@ -0,0 +1,86 @@ +<?php +/** + * @author Joas Schilling <nickvergessen@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCA\Files_Sharing; + + +use OC\Notification\INotification; +use OC\Notification\INotifier; + +class Notifier implements INotifier { + /** @var \OCP\L10N\IFactory */ + protected $factory; + + /** + * @param \OCP\L10N\IFactory $factory + */ + public function __construct(\OCP\L10N\IFactory $factory) { + $this->factory = $factory; + } + + /** + * @param INotification $notification + * @param string $languageCode The code of the language that should be used to prepare the notification + * @return INotification + */ + public function prepare(INotification $notification, $languageCode) { + if ($notification->getApp() !== 'files_sharing') { + // Not my app => throw + throw new \InvalidArgumentException(); + } + + // Read the language from the notification + $l = $this->factory->get('files_sharing', $languageCode); + + switch ($notification->getSubject()) { + // Deal with known subjects + case 'remote_share': + $params = $notification->getSubjectParameters(); + $notification->setParsedSubject( + (string) $l->t('You received %s as a remote share from %s', $params) + ); + + // Deal with the actions for a known subject + foreach ($notification->getActions() as $action) { + switch ($action->getLabel()) { + case 'accept': + $action->setParsedLabel( + (string) $l->t('Accept') + ); + break; + + case 'decline': + $action->setParsedLabel( + (string) $l->t('Decline') + ); + break; + } + + $notification->addParsedAction($action); + } + return $notification; + + default: + // Unknown subject => Unknown notification => throw + throw new \InvalidArgumentException(); + } + } +} diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php index 2771e0415b0..9aa9bbf562b 100644 --- a/apps/files_sharing/lib/sharedmount.php +++ b/apps/files_sharing/lib/sharedmount.php @@ -81,7 +81,7 @@ class SharedMount extends MountPoint implements MoveableMount { ); if ($newMountPoint !== $share['file_target']) { - self::updateFileTarget($newMountPoint, $share); + $this->updateFileTarget($newMountPoint, $share); $share['file_target'] = $newMountPoint; $share['unique_name'] = true; } diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 43c76125e16..cde28c80fc4 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -17,6 +17,7 @@ OCP\Util::addStyle('files', 'upload'); OCP\Util::addScript('files', 'filesummary'); OCP\Util::addScript('files', 'breadcrumb'); OCP\Util::addScript('files', 'fileinfomodel'); +OCP\Util::addScript('files', 'newfilemenu'); OCP\Util::addScript('files', 'files'); OCP\Util::addScript('files', 'filelist'); OCP\Util::addscript('files', 'keyboardshortcuts'); diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php index df01ea0f738..8e03c67a9a3 100644 --- a/apps/files_sharing/tests/external/managertest.php +++ b/apps/files_sharing/tests/external/managertest.php @@ -50,6 +50,7 @@ class ManagerTest extends TestCase { $this->mountManager, new StorageFactory(), $httpHelper, + \OC::$server->getNotificationManager(), $this->uid ); } diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php index a1c87d73393..a4cc8209a8e 100644 --- a/apps/files_sharing/tests/server2server.php +++ b/apps/files_sharing/tests/server2server.php @@ -154,6 +154,7 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase { \OC\Files\Filesystem::getMountManager(), \OC\Files\Filesystem::getLoader(), \OC::$server->getHTTPHelper(), + \OC::$server->getNotificationManager(), $toDelete ); |