diff options
350 files changed, 2065 insertions, 576 deletions
diff --git a/apps/comments/l10n/ko.js b/apps/comments/l10n/ko.js index 3644ac7489d..c1aafb01d9c 100644 --- a/apps/comments/l10n/ko.js +++ b/apps/comments/l10n/ko.js @@ -1,8 +1,21 @@ OC.L10N.register( "comments", { + "<strong>Comments</strong> for files" : "파일에 <strong>댓글</strong> 남기기", + "%1$s commented" : "%1$s 님의 댓글", + "%1$s commented on %2$s" : "%2$s에 %1$s 님이 댓글 남김", + "Comments" : "댓글", + "Type in a new comment..." : "새 댓글을 입력하십시오...", + "Delete comment" : "댓글 삭제", + "Post" : "게시", "Cancel" : "취소", + "Edit comment" : "댓글 편집", + "[Deleted user]" : "[삭제된 사용자]", + "No other comments available" : "더 이상 댓글 없음", + "More comments..." : "더 많은 댓글...", "Save" : "저장", + "Allowed characters {count} of {max}" : "{count}/{max} 글자 사용 가능", + "{count} unread comments" : "읽지 않은 댓글 {count}개", "Comment" : "설명" }, "nplurals=1; plural=0;"); diff --git a/apps/comments/l10n/ko.json b/apps/comments/l10n/ko.json index d6a4b49e5b9..5ccd0dc52eb 100644 --- a/apps/comments/l10n/ko.json +++ b/apps/comments/l10n/ko.json @@ -1,6 +1,19 @@ { "translations": { + "<strong>Comments</strong> for files" : "파일에 <strong>댓글</strong> 남기기", + "%1$s commented" : "%1$s 님의 댓글", + "%1$s commented on %2$s" : "%2$s에 %1$s 님이 댓글 남김", + "Comments" : "댓글", + "Type in a new comment..." : "새 댓글을 입력하십시오...", + "Delete comment" : "댓글 삭제", + "Post" : "게시", "Cancel" : "취소", + "Edit comment" : "댓글 편집", + "[Deleted user]" : "[삭제된 사용자]", + "No other comments available" : "더 이상 댓글 없음", + "More comments..." : "더 많은 댓글...", "Save" : "저장", + "Allowed characters {count} of {max}" : "{count}/{max} 글자 사용 가능", + "{count} unread comments" : "읽지 않은 댓글 {count}개", "Comment" : "설명" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/comments/l10n/nl.js b/apps/comments/l10n/nl.js index 5772952a291..d168c0658db 100644 --- a/apps/comments/l10n/nl.js +++ b/apps/comments/l10n/nl.js @@ -13,7 +13,7 @@ OC.L10N.register( "[Deleted user]" : "[Verwijderde gebruiker]", "No other comments available" : "Geen andere reacties beschikbaar", "More comments..." : "Meer reacties...", - "Save" : "Bewaren", + "Save" : "Opslaan", "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens", "{count} unread comments" : "{count} ongelezen reacties", "Comment" : "Reactie" diff --git a/apps/comments/l10n/nl.json b/apps/comments/l10n/nl.json index a8c92241a77..74050c7f816 100644 --- a/apps/comments/l10n/nl.json +++ b/apps/comments/l10n/nl.json @@ -11,7 +11,7 @@ "[Deleted user]" : "[Verwijderde gebruiker]", "No other comments available" : "Geen andere reacties beschikbaar", "More comments..." : "Meer reacties...", - "Save" : "Bewaren", + "Save" : "Opslaan", "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens", "{count} unread comments" : "{count} ongelezen reacties", "Comment" : "Reactie" diff --git a/apps/comments/l10n/pl.js b/apps/comments/l10n/pl.js index 543fed7a1ad..09142286773 100644 --- a/apps/comments/l10n/pl.js +++ b/apps/comments/l10n/pl.js @@ -1,8 +1,21 @@ OC.L10N.register( "comments", { + "<strong>Comments</strong> for files" : "<strong>Komentarze</strong> dla plików", + "%1$s commented" : "%1$s skomentował", + "%1$s commented on %2$s" : "%1$s skomentował %2$s", + "Comments" : "Komentarze", + "Type in a new comment..." : "Wprowadź nowy komentarz...", + "Delete comment" : "Skasuj komentarz", + "Post" : "Zapisz", "Cancel" : "Anuluj", + "Edit comment" : "Edytuj komentarz", + "[Deleted user]" : "[Usunięty użytkownik]", + "No other comments available" : "Nie ma więcej komentarzy", + "More comments..." : "Więcej komentarzy...", "Save" : "Zapisz", + "Allowed characters {count} of {max}" : "Dozwolone znaki {count} z {max}", + "{count} unread comments" : "{count} nieprzeczytanych komentarzy", "Comment" : "Komentarz" }, "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/comments/l10n/pl.json b/apps/comments/l10n/pl.json index 836f3bb1dcd..92b9f66bf1c 100644 --- a/apps/comments/l10n/pl.json +++ b/apps/comments/l10n/pl.json @@ -1,6 +1,19 @@ { "translations": { + "<strong>Comments</strong> for files" : "<strong>Komentarze</strong> dla plików", + "%1$s commented" : "%1$s skomentował", + "%1$s commented on %2$s" : "%1$s skomentował %2$s", + "Comments" : "Komentarze", + "Type in a new comment..." : "Wprowadź nowy komentarz...", + "Delete comment" : "Skasuj komentarz", + "Post" : "Zapisz", "Cancel" : "Anuluj", + "Edit comment" : "Edytuj komentarz", + "[Deleted user]" : "[Usunięty użytkownik]", + "No other comments available" : "Nie ma więcej komentarzy", + "More comments..." : "Więcej komentarzy...", "Save" : "Zapisz", + "Allowed characters {count} of {max}" : "Dozwolone znaki {count} z {max}", + "{count} unread comments" : "{count} nieprzeczytanych komentarzy", "Comment" : "Komentarz" },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/comments/l10n/sr.js b/apps/comments/l10n/sr.js index caee7bc28ff..aae126ef40f 100644 --- a/apps/comments/l10n/sr.js +++ b/apps/comments/l10n/sr.js @@ -1,8 +1,21 @@ OC.L10N.register( "comments", { - "Cancel" : "Одустани", + "<strong>Comments</strong> for files" : "<strong>Коментари</strong> фајлова", + "%1$s commented" : "%1$s коментариса", + "%1$s commented on %2$s" : "%1$s коментариса на %2$s", + "Comments" : "Коментари", + "Type in a new comment..." : "Укуцајте нови коментар...", + "Delete comment" : "Обриши коментар", + "Post" : "Објави", + "Cancel" : "Откажи", + "Edit comment" : "Уреди коментар", + "[Deleted user]" : "[Обрисан корисник]", + "No other comments available" : "Нема других коментара", + "More comments..." : "Још коментара...", "Save" : "Сачувај", + "Allowed characters {count} of {max}" : "Дозвољених {count} знакова од {max}", + "{count} unread comments" : "{count} непрочитаних коментара", "Comment" : "Коментар" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/comments/l10n/sr.json b/apps/comments/l10n/sr.json index 7fa9bdcf27a..12cdb29deb5 100644 --- a/apps/comments/l10n/sr.json +++ b/apps/comments/l10n/sr.json @@ -1,6 +1,19 @@ { "translations": { - "Cancel" : "Одустани", + "<strong>Comments</strong> for files" : "<strong>Коментари</strong> фајлова", + "%1$s commented" : "%1$s коментариса", + "%1$s commented on %2$s" : "%1$s коментариса на %2$s", + "Comments" : "Коментари", + "Type in a new comment..." : "Укуцајте нови коментар...", + "Delete comment" : "Обриши коментар", + "Post" : "Објави", + "Cancel" : "Откажи", + "Edit comment" : "Уреди коментар", + "[Deleted user]" : "[Обрисан корисник]", + "No other comments available" : "Нема других коментара", + "More comments..." : "Још коментара...", "Save" : "Сачувај", + "Allowed characters {count} of {max}" : "Дозвољених {count} знакова од {max}", + "{count} unread comments" : "{count} непрочитаних коментара", "Comment" : "Коментар" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/dav/appinfo/database.xml b/apps/dav/appinfo/database.xml index 4221e590fa5..b0a7ad4f2a8 100644 --- a/apps/dav/appinfo/database.xml +++ b/apps/dav/appinfo/database.xml @@ -283,7 +283,7 @@ CREATE TABLE calendarobjects ( description TEXT, calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0', calendarcolor VARBINARY(10), - timezone TEXT, + timezone CLOB, components VARBINARY(20), transparent TINYINT(1) NOT NULL DEFAULT '0', UNIQUE(principaluri, uri) @@ -337,7 +337,7 @@ CREATE TABLE calendarobjects ( </field> <field> <name>timezone</name> - <type>text</type> + <type>clob</type> </field> <field> <name>components</name> diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index 16222463111..4f1e805d99e 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -5,7 +5,7 @@ <description>ownCloud WebDAV endpoint</description> <licence>AGPL</licence> <author>owncloud.org</author> - <version>0.2.0</version> + <version>0.2.1</version> <default_enable/> <types> <filesystem/> diff --git a/apps/dav/lib/caldav/calendar.php b/apps/dav/lib/caldav/calendar.php index 16acbbf53a3..55f1acec396 100644 --- a/apps/dav/lib/caldav/calendar.php +++ b/apps/dav/lib/caldav/calendar.php @@ -23,6 +23,7 @@ namespace OCA\DAV\CalDAV; use OCA\DAV\DAV\Sharing\IShareable; use Sabre\DAV\Exception\Forbidden; +use Sabre\DAV\PropPatch; class Calendar extends \Sabre\CalDAV\Calendar implements IShareable { @@ -122,4 +123,13 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable { } parent::delete(); } + + function propPatch(PropPatch $propPatch) { + $mutations = $propPatch->getMutations(); + // If this is a shared calendar, the user can only change the enabled property, to hide it. + if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) && (sizeof($mutations) !== 1 || !isset($mutations['{http://owncloud.org/ns}calendar-enabled']))) { + throw new Forbidden(); + } + parent::propPatch($propPatch); + } } diff --git a/apps/dav/lib/carddav/addressbook.php b/apps/dav/lib/carddav/addressbook.php index be57a2d90a1..6ae938b8e29 100644 --- a/apps/dav/lib/carddav/addressbook.php +++ b/apps/dav/lib/carddav/addressbook.php @@ -23,6 +23,7 @@ namespace OCA\DAV\CardDAV; use OCA\DAV\DAV\Sharing\IShareable; use Sabre\DAV\Exception\Forbidden; use Sabre\DAV\Exception\NotFound; +use Sabre\DAV\PropPatch; class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable { @@ -83,14 +84,14 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable { } // add the current user - if (isset($this->addressBookInfo['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'])) { - $owner = $this->addressBookInfo['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal']; + if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) { + $owner = $this->addressBookInfo['{http://owncloud.org/ns}owner-principal']; $acl[] = [ 'privilege' => '{DAV:}read', 'principal' => $owner, 'protected' => true, ]; - if ($this->addressBookInfo['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only']) { + if ($this->addressBookInfo['{http://owncloud.org/ns}read-only']) { $acl[] = [ 'privilege' => '{DAV:}write', 'principal' => $owner, @@ -162,6 +163,13 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable { parent::delete(); } + function propPatch(PropPatch $propPatch) { + if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) { + throw new Forbidden(); + } + parent::propPatch($propPatch); + } + public function getContactsGroups() { /** @var CardDavBackend $cardDavBackend */ $cardDavBackend = $this->carddavBackend; diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php index 687ef7f3a87..bfb6ea82ad7 100644 --- a/apps/dav/lib/carddav/carddavbackend.php +++ b/apps/dav/lib/carddav/carddavbackend.php @@ -78,7 +78,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { */ public function __construct(IDBConnection $db, Principal $principalBackend, - $dispatcher ) { + EventDispatcherInterface $dispatcher = null) { $this->db = $db; $this->principalBackend = $principalBackend; $this->dispatcher = $dispatcher; diff --git a/apps/dav/lib/connector/sabre/node.php b/apps/dav/lib/connector/sabre/node.php index 41dcb421913..95a5f0a8749 100644 --- a/apps/dav/lib/connector/sabre/node.php +++ b/apps/dav/lib/connector/sabre/node.php @@ -230,7 +230,7 @@ abstract class Node implements \Sabre\DAV\INode { if ($this->info->isDeletable()) { $p .= 'D'; } - if ($this->info->isDeletable()) { + if ($this->info->isUpdateable()) { $p .= 'NV'; // Renameable, Moveable } if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) { diff --git a/apps/dav/lib/dav/sharing/backend.php b/apps/dav/lib/dav/sharing/backend.php index 8e2a9307b70..ffc4193e34b 100644 --- a/apps/dav/lib/dav/sharing/backend.php +++ b/apps/dav/lib/dav/sharing/backend.php @@ -190,6 +190,14 @@ class Backend { 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], 'protected' => true, ]; + } else if ($this->resourceType === 'calendar') { + // Allow changing the properties of read only calendars, + // so users can change the visibility. + $acl[] = [ + 'privilege' => '{DAV:}write-properties', + 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], + 'protected' => true, + ]; } } return $acl; diff --git a/apps/dav/tests/unit/caldav/calendartest.php b/apps/dav/tests/unit/caldav/calendartest.php index 4a3c94e8aba..c41070ea435 100644 --- a/apps/dav/tests/unit/caldav/calendartest.php +++ b/apps/dav/tests/unit/caldav/calendartest.php @@ -23,6 +23,7 @@ namespace OCA\DAV\Tests\Unit\CalDAV; use OCA\DAV\CalDAV\CalDavBackend; use OCA\DAV\CalDAV\Calendar; +use Sabre\DAV\PropPatch; use Test\TestCase; class CalendarTest extends TestCase { @@ -63,4 +64,42 @@ class CalendarTest extends TestCase { $c = new Calendar($backend, $calendarInfo); $c->delete(); } + + public function dataPropPatch() { + return [ + [[], true], + [[ + '{http://owncloud.org/ns}calendar-enabled' => true, + ], false], + [[ + '{DAV:}displayname' => true, + ], true], + [[ + '{DAV:}displayname' => true, + '{http://owncloud.org/ns}calendar-enabled' => true, + ], true], + ]; + } + + /** + * @dataProvider dataPropPatch + */ + public function testPropPatch($mutations, $throws) { + /** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */ + $backend = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock(); + $calendarInfo = [ + '{http://owncloud.org/ns}owner-principal' => 'user1', + 'principaluri' => 'user2', + 'id' => 666 + ]; + $c = new Calendar($backend, $calendarInfo); + + if ($throws) { + $this->setExpectedException('\Sabre\DAV\Exception\Forbidden'); + } + $c->propPatch(new PropPatch($mutations)); + if (!$throws) { + $this->assertTrue(true); + } + } } diff --git a/apps/dav/tests/unit/carddav/addressbooktest.php b/apps/dav/tests/unit/carddav/addressbooktest.php index d714fc71679..854c121a95d 100644 --- a/apps/dav/tests/unit/carddav/addressbooktest.php +++ b/apps/dav/tests/unit/carddav/addressbooktest.php @@ -23,6 +23,7 @@ namespace OCA\DAV\Tests\Unit\CardDAV; use OCA\DAV\CardDAV\AddressBook; use OCA\DAV\CardDAV\CardDavBackend; +use Sabre\DAV\PropPatch; use Test\TestCase; class AddressBookTest extends TestCase { @@ -61,4 +62,19 @@ class AddressBookTest extends TestCase { $c = new AddressBook($backend, $calendarInfo); $c->delete(); } + + /** + * @expectedException \Sabre\DAV\Exception\Forbidden + */ + public function testPropPatch() { + /** @var \PHPUnit_Framework_MockObject_MockObject | CardDavBackend $backend */ + $backend = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')->disableOriginalConstructor()->getMock(); + $calendarInfo = [ + '{http://owncloud.org/ns}owner-principal' => 'user1', + 'principaluri' => 'user2', + 'id' => 666 + ]; + $c = new AddressBook($backend, $calendarInfo); + $c->propPatch(new PropPatch([])); + } } diff --git a/apps/dav/tests/unit/connector/sabre/node.php b/apps/dav/tests/unit/connector/sabre/node.php index dfbd95bfad8..8c92c2f063c 100644 --- a/apps/dav/tests/unit/connector/sabre/node.php +++ b/apps/dav/tests/unit/connector/sabre/node.php @@ -31,8 +31,8 @@ class Node extends \Test\TestCase { array(\OCP\Constants::PERMISSION_ALL, 'file', true, false, 'SRDNVW'), array(\OCP\Constants::PERMISSION_ALL, 'file', true, true, 'SRMDNVW'), array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE, 'file', true, false, 'SDNVW'), - array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RDNV'), - array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RW'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RD'), + array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RNVW'), array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'file', false, false, 'RDNVW'), array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'dir', false, false, 'RDNV'), ); diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js index 3b87ed3beb1..9b017eee43f 100644 --- a/apps/encryption/l10n/de_DE.js +++ b/apps/encryption/l10n/de_DE.js @@ -27,6 +27,7 @@ OC.L10N.register( "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit", "Bad Signature" : "Falsche Signatur", "Missing Signature" : "Fehlende Signatur", + "one-time password for server-side-encryption" : "Einmalpasswort für Serverseitige Verschlüsselung", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.", diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json index 6d247b09bc9..a3754c75846 100644 --- a/apps/encryption/l10n/de_DE.json +++ b/apps/encryption/l10n/de_DE.json @@ -25,6 +25,7 @@ "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit", "Bad Signature" : "Falsche Signatur", "Missing Signature" : "Fehlende Signatur", + "one-time password for server-side-encryption" : "Einmalpasswort für Serverseitige Verschlüsselung", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.", "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.", diff --git a/apps/encryption/l10n/ko.js b/apps/encryption/l10n/ko.js index caaed725440..0b47c4c741e 100644 --- a/apps/encryption/l10n/ko.js +++ b/apps/encryption/l10n/ko.js @@ -25,6 +25,8 @@ OC.L10N.register( "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오", "Encryption App is enabled and ready" : "암호화 앱이 활성화되었고 준비됨", + "Bad Signature" : "잘못된 서명", + "Missing Signature" : "서명 없음", "one-time password for server-side-encryption" : "서버 측 암호화용 일회용 암호", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 읽을 수 없습니다. 공유된 파일이라면 파일 소유자에게 연락하여 다시 공유해 달라고 요청하십시오.", diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json index c8e4779b29c..fa0a8feb04b 100644 --- a/apps/encryption/l10n/ko.json +++ b/apps/encryption/l10n/ko.json @@ -23,6 +23,8 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오", "Encryption App is enabled and ready" : "암호화 앱이 활성화되었고 준비됨", + "Bad Signature" : "잘못된 서명", + "Missing Signature" : "서명 없음", "one-time password for server-side-encryption" : "서버 측 암호화용 일회용 암호", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 읽을 수 없습니다. 공유된 파일이라면 파일 소유자에게 연락하여 다시 공유해 달라고 요청하십시오.", diff --git a/apps/federatedfilesharing/l10n/gl.js b/apps/federatedfilesharing/l10n/gl.js index 86bf332fffc..b63658ea439 100644 --- a/apps/federatedfilesharing/l10n/gl.js +++ b/apps/federatedfilesharing/l10n/gl.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Invalid Federated Cloud ID" : "ID de nube federada incorrecto", "Sharing %s failed, because this item is already shared with %s" : "Fallou a compartición de %s, este elemento xa está compartido con %s", + "Not allowed to create a federated share with the same user" : "Non está permitido crear unha compartición federada co mesmo usuario", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Fallou a compartición de %s, non foi posíbel atopar %s,é probábel que o servidor non estea accesíbel." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/gl.json b/apps/federatedfilesharing/l10n/gl.json index 6ca669901fc..555ffa51968 100644 --- a/apps/federatedfilesharing/l10n/gl.json +++ b/apps/federatedfilesharing/l10n/gl.json @@ -1,6 +1,7 @@ { "translations": { "Invalid Federated Cloud ID" : "ID de nube federada incorrecto", "Sharing %s failed, because this item is already shared with %s" : "Fallou a compartición de %s, este elemento xa está compartido con %s", + "Not allowed to create a federated share with the same user" : "Non está permitido crear unha compartición federada co mesmo usuario", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Fallou a compartición de %s, non foi posíbel atopar %s,é probábel que o servidor non estea accesíbel." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/ko.js b/apps/federatedfilesharing/l10n/ko.js index 33bf8c55065..87eb7f9c206 100644 --- a/apps/federatedfilesharing/l10n/ko.js +++ b/apps/federatedfilesharing/l10n/ko.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Invalid Federated Cloud ID" : "잘못된 연합 클라우드 ID", "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %s 님과 공유되어 있습니다", + "Not allowed to create a federated share with the same user" : "같은 사용자와 연합 공유를 만들 수 없음", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s을(를) 공유할 수 없습니다. %s을(를) 찾을 수 없습니다. 서버에 접근하지 못할 수도 있습니다." }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/ko.json b/apps/federatedfilesharing/l10n/ko.json index e3f1bf5f674..8fcae0e8e66 100644 --- a/apps/federatedfilesharing/l10n/ko.json +++ b/apps/federatedfilesharing/l10n/ko.json @@ -1,6 +1,7 @@ { "translations": { "Invalid Federated Cloud ID" : "잘못된 연합 클라우드 ID", "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %s 님과 공유되어 있습니다", + "Not allowed to create a federated share with the same user" : "같은 사용자와 연합 공유를 만들 수 없음", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s을(를) 공유할 수 없습니다. %s을(를) 찾을 수 없습니다. 서버에 접근하지 못할 수도 있습니다." },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml index e4a274c6425..3bd66e2954a 100644 --- a/apps/federation/appinfo/info.xml +++ b/apps/federation/appinfo/info.xml @@ -1,17 +1,18 @@ <?xml version="1.0"?> <info> - <id>federation</id> - <name>Federation</name> - <description>ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description> - <licence>AGPL</licence> - <author>Bjoern Schiessle</author> - <version>0.1.0</version> - <namespace>Federation</namespace> - <category>other</category> + <id>federation</id> + <name>Federation</name> + <description>ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description> + <licence>AGPL</licence> + <author>Bjoern Schiessle</author> + <version>0.1.0</version> + <namespace>Federation</namespace> + <category>other</category> <dependencies> <owncloud min-version="9.1" max-version="9.1" /> </dependencies> - <types> - <authentication/> - </types> + <default_enable/> + <types> + <authentication/> + </types> </info> diff --git a/apps/federation/l10n/cs_CZ.js b/apps/federation/l10n/cs_CZ.js index 487989cca3a..2cb9a725b9a 100644 --- a/apps/federation/l10n/cs_CZ.js +++ b/apps/federation/l10n/cs_CZ.js @@ -5,6 +5,11 @@ 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 ownCloud server found" : "Nenalezen žádný ownCloud server", "Could not add server" : "Nepodařilo se přidat server", - "Federation" : "Sdružování" + "Federation" : "Sdružování", + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Sdružování vám dovoluje přistupovat k seznamům uživatelů na jiných důvěryhodných ownCloudech. Využívá se například k automatickému dokončování při výběru uživatele pro sdílení v rámci sdružení.", + "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 ownCloud Servers" : "Důvěryhodné ownCloud servery", + "+ Add ownCloud server" : "+ Přidat ownCloud server", + "ownCloud Server" : "ownCloud server" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/federation/l10n/cs_CZ.json b/apps/federation/l10n/cs_CZ.json index e87c8f8e1f6..038d391ee8e 100644 --- a/apps/federation/l10n/cs_CZ.json +++ b/apps/federation/l10n/cs_CZ.json @@ -3,6 +3,11 @@ "Server is already in the list of trusted servers." : "Server je již přidán na seznam důvěryhodných serverů.", "No ownCloud server found" : "Nenalezen žádný ownCloud server", "Could not add server" : "Nepodařilo se přidat server", - "Federation" : "Sdružování" + "Federation" : "Sdružování", + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Sdružování vám dovoluje přistupovat k seznamům uživatelů na jiných důvěryhodných ownCloudech. Využívá se například k automatickému dokončování při výběru uživatele pro sdílení v rámci sdružení.", + "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 ownCloud Servers" : "Důvěryhodné ownCloud servery", + "+ Add ownCloud server" : "+ Přidat ownCloud server", + "ownCloud Server" : "ownCloud server" },"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 e836ed04d29..d810cbf4218 100644 --- a/apps/federation/l10n/de.js +++ b/apps/federation/l10n/de.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Es wurde kein ownCloud Server gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es dir dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es dir dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet.", + "Add server automatically once a federated share was created successfully" : "Füge einen mit ownCloud Federation verbundenen Server automatisch hinzu, sobald die Verbindung einmal erfolgreich erstellt wurde", + "Trusted ownCloud Servers" : "vertrauenswürdige ownCloud Server", + "+ Add ownCloud server" : "+ ownCloud Server hinzufügen", + "ownCloud Server" : "ownCloud Server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/de.json b/apps/federation/l10n/de.json index 9585cdd87db..c8fafc9166d 100644 --- a/apps/federation/l10n/de.json +++ b/apps/federation/l10n/de.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Es wurde kein ownCloud Server gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es dir dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es dir dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet.", + "Add server automatically once a federated share was created successfully" : "Füge einen mit ownCloud Federation verbundenen Server automatisch hinzu, sobald die Verbindung einmal erfolgreich erstellt wurde", + "Trusted ownCloud Servers" : "vertrauenswürdige ownCloud Server", + "+ Add ownCloud server" : "+ ownCloud Server hinzufügen", + "ownCloud Server" : "ownCloud Server" },"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 f590b47b8bf..4ce958bbf23 100644 --- a/apps/federation/l10n/de_DE.js +++ b/apps/federation/l10n/de_DE.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Es wurde kein ownCloud Server gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet.", + "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobale eine federated Freigabe erstellt wurde", + "Trusted ownCloud Servers" : "Vertrauenswürdige ownCloud Server", + "+ Add ownCloud server" : "+ ownCloud Server hinzufügen", + "ownCloud Server" : "ownCloud Server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/de_DE.json b/apps/federation/l10n/de_DE.json index e46dc186f1b..82bbecc563d 100644 --- a/apps/federation/l10n/de_DE.json +++ b/apps/federation/l10n/de_DE.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Es wurde kein ownCloud Server gefunden", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation ermöglicht es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Dies wird, zum Beispiel, für die automatische Vervollständigung externer Benutzer verwendet.", + "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobale eine federated Freigabe erstellt wurde", + "Trusted ownCloud Servers" : "Vertrauenswürdige ownCloud Server", + "+ Add ownCloud server" : "+ ownCloud Server hinzufügen", + "ownCloud Server" : "ownCloud Server" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/en_GB.js b/apps/federation/l10n/en_GB.js index 348f84a7964..906ddbd43d5 100644 --- a/apps/federation/l10n/en_GB.js +++ b/apps/federation/l10n/en_GB.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "No ownCloud server found", "Could not add server" : "Could not add server", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation allows you to connect with other trusted ownClouds 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" : "Add server automatically once a federated share was created successfully", + "Trusted ownCloud Servers" : "Trusted ownCloud Servers", + "+ Add ownCloud server" : "+ Add ownCloud server", + "ownCloud Server" : "ownCloud Server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/en_GB.json b/apps/federation/l10n/en_GB.json index 435658922f9..fb80e4571f7 100644 --- a/apps/federation/l10n/en_GB.json +++ b/apps/federation/l10n/en_GB.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "No ownCloud server found", "Could not add server" : "Could not add server", "Federation" : "Federation", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federation allows you to connect with other trusted ownClouds 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" : "Add server automatically once a federated share was created successfully", + "Trusted ownCloud Servers" : "Trusted ownCloud Servers", + "+ Add ownCloud server" : "+ Add ownCloud server", + "ownCloud Server" : "ownCloud Server" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/fi_FI.js b/apps/federation/l10n/fi_FI.js index b9f813e993d..3a2d85a51b6 100644 --- a/apps/federation/l10n/fi_FI.js +++ b/apps/federation/l10n/fi_FI.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "ownCloud-palvelinta ei löydy", "Could not add server" : "Palvelimen lisääminen ei onnistunut", "Federation" : "Federaatio", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa.", + "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti", + "Trusted ownCloud Servers" : "Luotetut ownCloud-palvelimet", + "+ Add ownCloud server" : "+ Lisää ownCloud-palvelin", + "ownCloud Server" : "ownCloud-palvelin" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/fi_FI.json b/apps/federation/l10n/fi_FI.json index 0c8280ab0be..8060a437617 100644 --- a/apps/federation/l10n/fi_FI.json +++ b/apps/federation/l10n/fi_FI.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "ownCloud-palvelinta ei löydy", "Could not add server" : "Palvelimen lisääminen ei onnistunut", "Federation" : "Federaatio", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa.", + "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti", + "Trusted ownCloud Servers" : "Luotetut ownCloud-palvelimet", + "+ Add ownCloud server" : "+ Lisää ownCloud-palvelin", + "ownCloud Server" : "ownCloud-palvelin" },"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 a6e4fbda16f..c1533771f18 100644 --- a/apps/federation/l10n/fr.js +++ b/apps/federation/l10n/fr.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Aucun serveur ownCloud trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud vous permet de vous connecter avec d'autres ownCloud de confiance pour partager l'annuaire d'utilisateurs. Par exemple, cela peut être utilisé pour compléter automatiquement les noms des utilisateurs externes pour le partage fédéré." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud permet la connexion à d'autres instances ownCloud de confiance pour partager les annuaires d'utilisateurs. Cela peut par exemple être utilisé pour compléter automatiquement les noms des utilisateurs externes lors d'un partage vers une autre instance.", + "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créer avec succès .", + "Trusted ownCloud Servers" : "Serveur ownCloud de confiance ", + "+ Add ownCloud server" : "Ajouter un serveur Owncloud", + "ownCloud Server" : "Serveur OwnCloud" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/fr.json b/apps/federation/l10n/fr.json index c84cb78dbc1..8863bc73810 100644 --- a/apps/federation/l10n/fr.json +++ b/apps/federation/l10n/fr.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Aucun serveur ownCloud trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud vous permet de vous connecter avec d'autres ownCloud de confiance pour partager l'annuaire d'utilisateurs. Par exemple, cela peut être utilisé pour compléter automatiquement les noms des utilisateurs externes pour le partage fédéré." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Fédération ownCloud permet la connexion à d'autres instances ownCloud de confiance pour partager les annuaires d'utilisateurs. Cela peut par exemple être utilisé pour compléter automatiquement les noms des utilisateurs externes lors d'un partage vers une autre instance.", + "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créer avec succès .", + "Trusted ownCloud Servers" : "Serveur ownCloud de confiance ", + "+ Add ownCloud server" : "Ajouter un serveur Owncloud", + "ownCloud Server" : "Serveur OwnCloud" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/he.js b/apps/federation/l10n/he.js index 1d7e25bbc34..55facae61a6 100644 --- a/apps/federation/l10n/he.js +++ b/apps/federation/l10n/he.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "לא אותר שרת ownCloud", "Could not add server" : "לא ניתן היה להוסיף שרת", "Federation" : "איגוד", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "איגוד ownCloud מאפשר לך להתחבר לשרתי ownCloud מהימנים אחרים למטרת החלפת תיקיות משתמש. לדוגמא ניתן יהיה להשתמש בזה כדי להשלים באופן אוטומטי משתמשים חיצוניים לשיתוף מאוגד." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "איגוד ownCloud מאפשר לך להתחבר לשרתי ownCloud מהימנים אחרים למטרת החלפת תיקיות משתמש. לדוגמא ניתן יהיה להשתמש בזה כדי להשלים באופן אוטומטי משתמשים חיצוניים לשיתוף מאוגד.", + "Add server automatically once a federated share was created successfully" : "הוספת שרת באופן אוטומטי לאחר יצירת שרת מאוגד", + "Trusted ownCloud Servers" : "שרתי ownCloud אמינים", + "+ Add ownCloud server" : "+ הוספת שרת ownCloud", + "ownCloud Server" : "שרת ownCloud" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/he.json b/apps/federation/l10n/he.json index 1cfce307743..3ed837ffedc 100644 --- a/apps/federation/l10n/he.json +++ b/apps/federation/l10n/he.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "לא אותר שרת ownCloud", "Could not add server" : "לא ניתן היה להוסיף שרת", "Federation" : "איגוד", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "איגוד ownCloud מאפשר לך להתחבר לשרתי ownCloud מהימנים אחרים למטרת החלפת תיקיות משתמש. לדוגמא ניתן יהיה להשתמש בזה כדי להשלים באופן אוטומטי משתמשים חיצוניים לשיתוף מאוגד." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "איגוד ownCloud מאפשר לך להתחבר לשרתי ownCloud מהימנים אחרים למטרת החלפת תיקיות משתמש. לדוגמא ניתן יהיה להשתמש בזה כדי להשלים באופן אוטומטי משתמשים חיצוניים לשיתוף מאוגד.", + "Add server automatically once a federated share was created successfully" : "הוספת שרת באופן אוטומטי לאחר יצירת שרת מאוגד", + "Trusted ownCloud Servers" : "שרתי ownCloud אמינים", + "+ Add ownCloud server" : "+ הוספת שרת ownCloud", + "ownCloud Server" : "שרת ownCloud" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/it.js b/apps/federation/l10n/it.js index 2f5a8be4798..c9a0de56f03 100644 --- a/apps/federation/l10n/it.js +++ b/apps/federation/l10n/it.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Nessun server ownCloud trovato", "Could not add server" : "Impossibile aggiungere il server", "Federation" : "Federazione", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione di ownCloud ti consente di collegarti con altri ownCloud di fiducia per scambiare la cartella degli utenti. Ad esempio, sarà utilizzata per il completamento automatico degli utenti esterni per la condivisione federata." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione di ownCloud ti consente di collegarti con altri ownCloud di fiducia per scambiare la cartella degli utenti. Ad esempio, sarà utilizzata per il completamento automatico degli 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 ownCloud Servers" : "Server ownCloud di fiducia", + "+ Add ownCloud server" : "+ Aggiungi server ownCloud", + "ownCloud Server" : "Server ownCloud" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/it.json b/apps/federation/l10n/it.json index 69b8eb18196..9c22c4bb29c 100644 --- a/apps/federation/l10n/it.json +++ b/apps/federation/l10n/it.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Nessun server ownCloud trovato", "Could not add server" : "Impossibile aggiungere il server", "Federation" : "Federazione", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione di ownCloud ti consente di collegarti con altri ownCloud di fiducia per scambiare la cartella degli utenti. Ad esempio, sarà utilizzata per il completamento automatico degli utenti esterni per la condivisione federata." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione di ownCloud ti consente di collegarti con altri ownCloud di fiducia per scambiare la cartella degli utenti. Ad esempio, sarà utilizzata per il completamento automatico degli 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 ownCloud Servers" : "Server ownCloud di fiducia", + "+ Add ownCloud server" : "+ Aggiungi server ownCloud", + "ownCloud Server" : "Server ownCloud" },"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 c97647f9755..3ea46d85b75 100644 --- a/apps/federation/l10n/ja.js +++ b/apps/federation/l10n/ja.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "ownCloudサーバーが見つかりません", "Could not add server" : "サーバーを追加できませんでした", "Federation" : "連携", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 連携機能では信頼済のownCloudのユーザーディレクトリを相互に接続することができます。例えば、連携で共有したときには、連携先の外部ユーザー名の自動補完を使えるようになります。" + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 連携機能では信頼済のownCloudのユーザーディレクトリを相互に接続することができます。例えば、連携で共有したときには、連携先の外部ユーザー名の自動補完を使えるようになります。", + "Add server automatically once a federated share was created successfully" : "追加するサーバは自動的に統合され、共有が追加されました", + "Trusted ownCloud Servers" : "ownCloudサーバを信頼する", + "+ Add ownCloud server" : "ownCloudサーバを追加", + "ownCloud Server" : "ownCloudサーバ" }, "nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/ja.json b/apps/federation/l10n/ja.json index d074b189c7e..48c53f63137 100644 --- a/apps/federation/l10n/ja.json +++ b/apps/federation/l10n/ja.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "ownCloudサーバーが見つかりません", "Could not add server" : "サーバーを追加できませんでした", "Federation" : "連携", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 連携機能では信頼済のownCloudのユーザーディレクトリを相互に接続することができます。例えば、連携で共有したときには、連携先の外部ユーザー名の自動補完を使えるようになります。" + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 連携機能では信頼済のownCloudのユーザーディレクトリを相互に接続することができます。例えば、連携で共有したときには、連携先の外部ユーザー名の自動補完を使えるようになります。", + "Add server automatically once a federated share was created successfully" : "追加するサーバは自動的に統合され、共有が追加されました", + "Trusted ownCloud Servers" : "ownCloudサーバを信頼する", + "+ Add ownCloud server" : "ownCloudサーバを追加", + "ownCloud Server" : "ownCloudサーバ" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federation/l10n/ko.js b/apps/federation/l10n/ko.js new file mode 100644 index 00000000000..c5baf30bb04 --- /dev/null +++ b/apps/federation/l10n/ko.js @@ -0,0 +1,15 @@ +OC.L10N.register( + "federation", + { + "Server added to the list of trusted ownClouds" : "신뢰할 수 있는 ownCloud 목록에 서버 추가함", + "Server is already in the list of trusted servers." : "신뢰할 수 있는 서버 목록에 이미 추가되었습니다.", + "No ownCloud server found" : "ownCloud 서버를 찾을 수 없음", + "Could not add server" : "서버를 추가할 수 없음", + "Federation" : "연합 공유", + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 연합 공유를 사용하면 다른 믿을 수 있는 ownCloud 서버와 사용자 디렉터리를 상호간 공유할 수 있습니다. 이 정보는 연합 공유 시 외부 사용자 자동 완성 등에 사용합니다.", + "Add server automatically once a federated share was created successfully" : "연합 공유를 생성했을 때 자동으로 서버 추가", + "Trusted ownCloud Servers" : "신뢰할 수 있는 ownCloud 서버", + "+ Add ownCloud server" : "+ ownCloud 서버 추가", + "ownCloud Server" : "ownCloud 서버" +}, +"nplurals=1; plural=0;"); diff --git a/apps/federation/l10n/ko.json b/apps/federation/l10n/ko.json new file mode 100644 index 00000000000..373434a68ad --- /dev/null +++ b/apps/federation/l10n/ko.json @@ -0,0 +1,13 @@ +{ "translations": { + "Server added to the list of trusted ownClouds" : "신뢰할 수 있는 ownCloud 목록에 서버 추가함", + "Server is already in the list of trusted servers." : "신뢰할 수 있는 서버 목록에 이미 추가되었습니다.", + "No ownCloud server found" : "ownCloud 서버를 찾을 수 없음", + "Could not add server" : "서버를 추가할 수 없음", + "Federation" : "연합 공유", + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud 연합 공유를 사용하면 다른 믿을 수 있는 ownCloud 서버와 사용자 디렉터리를 상호간 공유할 수 있습니다. 이 정보는 연합 공유 시 외부 사용자 자동 완성 등에 사용합니다.", + "Add server automatically once a federated share was created successfully" : "연합 공유를 생성했을 때 자동으로 서버 추가", + "Trusted ownCloud Servers" : "신뢰할 수 있는 ownCloud 서버", + "+ Add ownCloud server" : "+ ownCloud 서버 추가", + "ownCloud Server" : "ownCloud 서버" +},"pluralForm" :"nplurals=1; plural=0;" +}
\ No newline at end of file diff --git a/apps/federation/l10n/nb_NO.js b/apps/federation/l10n/nb_NO.js index 2366f2e9298..6dcaec43573 100644 --- a/apps/federation/l10n/nb_NO.js +++ b/apps/federation/l10n/nb_NO.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Ingen ownCloud-server funnet", "Could not add server" : "Kunne ikke legge til server", "Federation" : "Sammenknytting", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud-sammenknytting lar deg koble til andre klarerte ownCloud'er og utveksle brukerkatalogen. Dette vil for eksempel brukes til å fylle ut eksterne brukere for sammenknyttet deling automatisk." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud-sammenknytting lar deg koble til andre klarerte ownCloud'er og utveksle brukerkatalogen. Dette vil for eksempel brukes til å fylle ut eksterne brukere for sammenknyttet deling automatisk.", + "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling er blitt opprettet", + "Trusted ownCloud Servers" : "Klarerte ownCloud-servere", + "+ Add ownCloud server" : "+ Ny ownCloud-server", + "ownCloud Server" : "ownCloud-server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/nb_NO.json b/apps/federation/l10n/nb_NO.json index 54f0526041e..9b4ceea4674 100644 --- a/apps/federation/l10n/nb_NO.json +++ b/apps/federation/l10n/nb_NO.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Ingen ownCloud-server funnet", "Could not add server" : "Kunne ikke legge til server", "Federation" : "Sammenknytting", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud-sammenknytting lar deg koble til andre klarerte ownCloud'er og utveksle brukerkatalogen. Dette vil for eksempel brukes til å fylle ut eksterne brukere for sammenknyttet deling automatisk." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud-sammenknytting lar deg koble til andre klarerte ownCloud'er og utveksle brukerkatalogen. Dette vil for eksempel brukes til å fylle ut eksterne brukere for sammenknyttet deling automatisk.", + "Add server automatically once a federated share was created successfully" : "Legg til server automatisk når en sammenknyttet deling er blitt opprettet", + "Trusted ownCloud Servers" : "Klarerte ownCloud-servere", + "+ Add ownCloud server" : "+ Ny ownCloud-server", + "ownCloud Server" : "ownCloud-server" },"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 b30d581efc6..1a7fcff09f8 100644 --- a/apps/federation/l10n/nl.js +++ b/apps/federation/l10n/nl.js @@ -2,10 +2,14 @@ OC.L10N.register( "federation", { "Server added to the list of trusted ownClouds" : "Server toegevoegd aan de lijst van vertrouwde ownClouds", - "Server is already in the list of trusted servers." : "Server is reeds inde lijst van vertrouwde servers.", + "Server is already in the list of trusted servers." : "Server bestaat reeds in de lijst van vertrouwde servers.", "No ownCloud server found" : "Geen ownCloud server gevonden", "Could not add server" : "Kon server niet toevoegen", "Federation" : "Federatie", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federatie stelt u in staat om een verbinding op te zetten met andere vertrouwde ownClouds en uw gebruikers lijst uit te wisselen. Dit stelt u bijvoorbeeld in staat om automatish suggesties te rkijgen voor gebruikeners tijdens het delen via federatie." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federatie stelt u in staat om een verbinding op te zetten met andere vertrouwde ownClouds en uw gebruikers lijst uit te wisselen. Dit stelt u bijvoorbeeld in staat om automatish suggesties te krijgen voor gebruikers tijdens het delen via federatie.", + "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is", + "Trusted ownCloud Servers" : "Vertrouwde ownCloud Servers", + "+ Add ownCloud server" : "+ Voeg ownCloud server toe", + "ownCloud Server" : "ownCloud Server" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/nl.json b/apps/federation/l10n/nl.json index e674fccec7f..0a052cbc911 100644 --- a/apps/federation/l10n/nl.json +++ b/apps/federation/l10n/nl.json @@ -1,9 +1,13 @@ { "translations": { "Server added to the list of trusted ownClouds" : "Server toegevoegd aan de lijst van vertrouwde ownClouds", - "Server is already in the list of trusted servers." : "Server is reeds inde lijst van vertrouwde servers.", + "Server is already in the list of trusted servers." : "Server bestaat reeds in de lijst van vertrouwde servers.", "No ownCloud server found" : "Geen ownCloud server gevonden", "Could not add server" : "Kon server niet toevoegen", "Federation" : "Federatie", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federatie stelt u in staat om een verbinding op te zetten met andere vertrouwde ownClouds en uw gebruikers lijst uit te wisselen. Dit stelt u bijvoorbeeld in staat om automatish suggesties te rkijgen voor gebruikeners tijdens het delen via federatie." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloud Federatie stelt u in staat om een verbinding op te zetten met andere vertrouwde ownClouds en uw gebruikers lijst uit te wisselen. Dit stelt u bijvoorbeeld in staat om automatish suggesties te krijgen voor gebruikers tijdens het delen via federatie.", + "Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is", + "Trusted ownCloud Servers" : "Vertrouwde ownCloud Servers", + "+ Add ownCloud server" : "+ Voeg ownCloud server toe", + "ownCloud Server" : "ownCloud Server" },"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 new file mode 100644 index 00000000000..d8e10260525 --- /dev/null +++ b/apps/federation/l10n/pl.js @@ -0,0 +1,15 @@ +OC.L10N.register( + "federation", + { + "Server added to the list of trusted ownClouds" : "Serwer został dodany do listy zaufanych serwerów ownCloud", + "Server is already in the list of trusted servers." : "Serwer znajduje się już na liście zaufanych serwerów.", + "No ownCloud server found" : "Nie znaleziono serwera ownCloud", + "Could not add server" : "Nie można dodać serwera", + "Federation" : "Stowarzyszenia", + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Stowarzyszenia ownCloud pozwalają na tworzenie połączeń z innymi zaufanymi serwerami ownCloud w celu współdzielenia katalogów użytkowników. Na przykład: funkcja będzie użyta przy tworzeniu podpowiedzi z listą zewnętrznych użytkowników przy tworzeniu stowarzyszonych udziałów.", + "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu stowarzyszonego udziału.", + "Trusted ownCloud Servers" : "Zaufane serwery ownCloud", + "+ Add ownCloud server" : "Dodaj serwer ownCloud", + "ownCloud Server" : "Serwer ownCloud" +}, +"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/federation/l10n/pl.json b/apps/federation/l10n/pl.json new file mode 100644 index 00000000000..78ac2f6265a --- /dev/null +++ b/apps/federation/l10n/pl.json @@ -0,0 +1,13 @@ +{ "translations": { + "Server added to the list of trusted ownClouds" : "Serwer został dodany do listy zaufanych serwerów ownCloud", + "Server is already in the list of trusted servers." : "Serwer znajduje się już na liście zaufanych serwerów.", + "No ownCloud server found" : "Nie znaleziono serwera ownCloud", + "Could not add server" : "Nie można dodać serwera", + "Federation" : "Stowarzyszenia", + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Stowarzyszenia ownCloud pozwalają na tworzenie połączeń z innymi zaufanymi serwerami ownCloud w celu współdzielenia katalogów użytkowników. Na przykład: funkcja będzie użyta przy tworzeniu podpowiedzi z listą zewnętrznych użytkowników przy tworzeniu stowarzyszonych udziałów.", + "Add server automatically once a federated share was created successfully" : "Dodaj serwer automatycznie po pomyślnym utworzeniu stowarzyszonego udziału.", + "Trusted ownCloud Servers" : "Zaufane serwery ownCloud", + "+ Add ownCloud server" : "Dodaj serwer ownCloud", + "ownCloud Server" : "Serwer ownCloud" +},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +}
\ No newline at end of file diff --git a/apps/federation/l10n/pt_BR.js b/apps/federation/l10n/pt_BR.js index ae8f9acbe2e..a3e4e0c6754 100644 --- a/apps/federation/l10n/pt_BR.js +++ b/apps/federation/l10n/pt_BR.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "Nenhum servidor ownCloud encontrado", "Could not add server" : "Não foi possível adicionar servidor", "Federation" : "Associação", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A associação ownCloud permite que você conecte com outros ownCloud confiáveis para haja trocas de diretórios do usuário. Por exemplo, este será utilizado para usuários externos de complementação para compartilhamento associado." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A associação ownCloud permite que você conecte com outros ownCloud confiáveis para que haja troca de diretórios do usuário. Por exemplo, este será utilizado para usuários externos de complementação para compartilhamento associado.", + "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito", + "Trusted ownCloud Servers" : "Servidores OwnCloud Confiáveis", + "+ Add ownCloud server" : "+ Adicionar servidor ownCloud", + "ownCloud Server" : "Servidor ownCloud" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federation/l10n/pt_BR.json b/apps/federation/l10n/pt_BR.json index f37a3a4e28b..c09a3036975 100644 --- a/apps/federation/l10n/pt_BR.json +++ b/apps/federation/l10n/pt_BR.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "Nenhum servidor ownCloud encontrado", "Could not add server" : "Não foi possível adicionar servidor", "Federation" : "Associação", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A associação ownCloud permite que você conecte com outros ownCloud confiáveis para haja trocas de diretórios do usuário. Por exemplo, este será utilizado para usuários externos de complementação para compartilhamento associado." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "A associação ownCloud permite que você conecte com outros ownCloud confiáveis para que haja troca de diretórios do usuário. Por exemplo, este será utilizado para usuários externos de complementação para compartilhamento associado.", + "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito", + "Trusted ownCloud Servers" : "Servidores OwnCloud Confiáveis", + "+ Add ownCloud server" : "+ Adicionar servidor ownCloud", + "ownCloud Server" : "Servidor ownCloud" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/sl.js b/apps/federation/l10n/sl.js index ab9bd3ec798..dcc7585481a 100644 --- a/apps/federation/l10n/sl.js +++ b/apps/federation/l10n/sl.js @@ -6,6 +6,8 @@ OC.L10N.register( "No ownCloud server found" : "Ni mogoče najti nobenega strežnika ownCloud.", "Could not add server" : "Ni mogoče dodati strežnika.", "Federation" : "Prenos dovoljenj", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Prenos dovoljenj ownCloud omogoča povezovanje z drugimi potrjenimi strežniki ownCloud in souporabo uporabniških map. Možnost je uporabljena za samodejno dokončanje izpisa zunanjih uporabnikov za souporabo s prenosom dovoljenj." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Prenos dovoljenj ownCloud omogoča povezovanje z drugimi potrjenimi strežniki ownCloud in souporabo uporabniških map. Možnost je uporabljena za samodejno dokončanje izpisa zunanjih uporabnikov za souporabo s prenosom dovoljenj.", + "Trusted ownCloud Servers" : "Zaupanja vredni ownCloud strežniki", + "+ Add ownCloud server" : "+ Dodaj ownCloud strežnik" }, "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 9a08a5c817a..a4a4b7cc8b3 100644 --- a/apps/federation/l10n/sl.json +++ b/apps/federation/l10n/sl.json @@ -4,6 +4,8 @@ "No ownCloud server found" : "Ni mogoče najti nobenega strežnika ownCloud.", "Could not add server" : "Ni mogoče dodati strežnika.", "Federation" : "Prenos dovoljenj", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Prenos dovoljenj ownCloud omogoča povezovanje z drugimi potrjenimi strežniki ownCloud in souporabo uporabniških map. Možnost je uporabljena za samodejno dokončanje izpisa zunanjih uporabnikov za souporabo s prenosom dovoljenj." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Prenos dovoljenj ownCloud omogoča povezovanje z drugimi potrjenimi strežniki ownCloud in souporabo uporabniških map. Možnost je uporabljena za samodejno dokončanje izpisa zunanjih uporabnikov za souporabo s prenosom dovoljenj.", + "Trusted ownCloud Servers" : "Zaupanja vredni ownCloud strežniki", + "+ Add ownCloud server" : "+ Dodaj ownCloud strežnik" },"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 a7265017d53..9d69a1fdf80 100644 --- a/apps/federation/l10n/sq.js +++ b/apps/federation/l10n/sq.js @@ -6,6 +6,10 @@ OC.L10N.register( "No ownCloud server found" : "S’u gjet shërbyes ownCloud", "Could not add server" : "Shërbyesi s’u shtua dot", "Federation" : "Federim", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ownCloud ju lejon të lidheni me ownCloud-e të tjerë për të shkëmbyer drejtorinë e përdoruesve. Për shembull, kjo do të përdoret për për vetëplotësim përdoruesish të jashtëm për ndarje të federuar." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ownCloud ju lejon të lidheni me ownCloud-e të tjerë për të shkëmbyer drejtorinë e përdoruesve. Për shembull, kjo do të përdoret për për vetëplotësim përdoruesish të jashtëm për ndarje të federuar.", + "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu shërbyesin pasi të jetë krijuar me sukses një ndarje e federuar", + "Trusted ownCloud Servers" : "Shërbyes ownCloud të Besuar", + "+ Add ownCloud server" : "+ Shtoni shërbyes ownCloud", + "ownCloud Server" : "Shërbyes ownCloud" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/sq.json b/apps/federation/l10n/sq.json index 39c86e7a7c4..67dcdcebe07 100644 --- a/apps/federation/l10n/sq.json +++ b/apps/federation/l10n/sq.json @@ -4,6 +4,10 @@ "No ownCloud server found" : "S’u gjet shërbyes ownCloud", "Could not add server" : "Shërbyesi s’u shtua dot", "Federation" : "Federim", - "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ownCloud ju lejon të lidheni me ownCloud-e të tjerë për të shkëmbyer drejtorinë e përdoruesve. Për shembull, kjo do të përdoret për për vetëplotësim përdoruesish të jashtëm për ndarje të federuar." + "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federimi ownCloud ju lejon të lidheni me ownCloud-e të tjerë për të shkëmbyer drejtorinë e përdoruesve. Për shembull, kjo do të përdoret për për vetëplotësim përdoruesish të jashtëm për ndarje të federuar.", + "Add server automatically once a federated share was created successfully" : "Shtoje vetvetiu shërbyesin pasi të jetë krijuar me sukses një ndarje e federuar", + "Trusted ownCloud Servers" : "Shërbyes ownCloud të Besuar", + "+ Add ownCloud server" : "+ Shtoni shërbyes ownCloud", + "ownCloud Server" : "Shërbyes ownCloud" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federation/l10n/sr.js b/apps/federation/l10n/sr.js new file mode 100644 index 00000000000..4a0fad5ae4c --- /dev/null +++ b/apps/federation/l10n/sr.js @@ -0,0 +1,15 @@ +OC.L10N.register( + "federation", + { + "Server added to the list of trusted ownClouds" : "Сервер додат на списак поверљивих оунКлауд сервера", + "Server is already in the list of trusted servers." : "Сервер је већ на списку поверљивих сервера.", + "No ownCloud server found" : "Ниједан оунКлауд сервер није нађен", + "Could not add server" : "Не могох да додам сервер", + "Federation" : "Здруживање", + "ownCloud Federation allows you to connect with other trusted ownClouds 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 ownCloud Servers" : "Поверљиви оунКлауд сервери", + "+ Add ownCloud server" : "+ Додај оунКлауд сервер", + "ownCloud Server" : "оунКлауд сервер" +}, +"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/federation/l10n/sr.json b/apps/federation/l10n/sr.json new file mode 100644 index 00000000000..d821056fc62 --- /dev/null +++ b/apps/federation/l10n/sr.json @@ -0,0 +1,13 @@ +{ "translations": { + "Server added to the list of trusted ownClouds" : "Сервер додат на списак поверљивих оунКлауд сервера", + "Server is already in the list of trusted servers." : "Сервер је већ на списку поверљивих сервера.", + "No ownCloud server found" : "Ниједан оунКлауд сервер није нађен", + "Could not add server" : "Не могох да додам сервер", + "Federation" : "Здруживање", + "ownCloud Federation allows you to connect with other trusted ownClouds 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 ownCloud Servers" : "Поверљиви оунКлауд сервери", + "+ Add ownCloud server" : "+ Додај оунКлауд сервер", + "ownCloud Server" : "оунКлауд сервер" +},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +}
\ No newline at end of file diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php index 77c552ee789..704fc9a9ace 100644 --- a/apps/federation/templates/settings-admin.php +++ b/apps/federation/templates/settings-admin.php @@ -12,13 +12,13 @@ style('federation', 'settings-admin') <p> <input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> /> - <label for="autoAddServers">Add server automatically once a federated share was created successfully</label> + <label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label> </p> - <h3>Trusted ownCloud Servers</h3> + <h3><?php p($l->t('Trusted ownCloud Servers')); ?></h3> <p id="ocFederationAddServer"> - <button id="ocFederationAddServerButton" class="">+ Add ownCloud server</button> - <input id="serverUrl" class="hidden" type="text" value="" placeholder="ownCloud Server" name="server_url"/> + <button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add ownCloud server')); ?></button> + <input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('ownCloud Server')); ?>" name="server_url"/> <span class="msg"></span> </p> <ul id="listOfTrustedServers"> diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index dc9d6b3c21c..79dc4b31346 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -6,7 +6,7 @@ <licence>AGPL</licence> <author>Robin Appelman, Vincent Petry</author> <default_enable/> - <version>1.5.0</version> + <version>1.5.1</version> <types> <filesystem/> </types> diff --git a/apps/files/appinfo/install.php b/apps/files/appinfo/install.php index 4d1e59d214c..55514935cda 100644 --- a/apps/files/appinfo/install.php +++ b/apps/files/appinfo/install.php @@ -24,3 +24,4 @@ // Cron job for scanning user storages \OC::$server->getJobList()->add('OCA\Files\BackgroundJob\ScanFiles'); \OC::$server->getJobList()->add('OCA\Files\BackgroundJob\DeleteOrphanedItems'); +\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\CleanupFileLocks'); diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index e4f8f8f29d7..72aff4cd0d4 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -102,3 +102,4 @@ if ($installedVersion === '1.1.9' && ( // Add cron job for scanning user storages \OC::$server->getJobList()->add('OCA\Files\BackgroundJob\ScanFiles'); \OC::$server->getJobList()->add('OCA\Files\BackgroundJob\DeleteOrphanedItems'); +\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\CleanupFileLocks'); diff --git a/apps/files/css/files.css b/apps/files/css/files.css index b65af1fa0f3..bfa5340fe09 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -793,6 +793,19 @@ html.ie8 #controls .button.new { background-size: 16px 16px; } +#filestable .filename .action .icon.hidden, +#filestable .selectedActions a .icon.hidden, +#controls .actions .button .icon.hidden { + display: none; +} + +#filestable .filename .action .icon.loading, +#filestable .selectedActions a .icon.loading, +#controls .actions .button .icon.loading { + width: 15px; + height: 15px; +} + .app-files .actions .button.new .icon { margin-bottom: 2px; } diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 05ff2f0cbfa..69e32d500c4 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -659,19 +659,18 @@ * Replaces the download icon with a loading spinner and vice versa * - also adds the class disabled to the passed in element * - * @param downloadButtonElement download fileaction + * @param {jQuery} $downloadButtonElement download fileaction * @param {boolean} showIt whether to show the spinner(true) or to hide it(false) */ - OCA.Files.FileActions.updateFileActionSpinner = function(downloadButtonElement, showIt) { - var icon = downloadButtonElement.find('img'), - sourceImage = icon.attr('src'); - - if(showIt) { - downloadButtonElement.addClass('disabled'); - icon.attr('src', sourceImage.replace('actions/download.svg', 'loading-small.gif')); + OCA.Files.FileActions.updateFileActionSpinner = function($downloadButtonElement, showIt) { + var $icon = $downloadButtonElement.find('.icon'); + if (showIt) { + var $loadingIcon = $('<span class="icon loading"></span>'); + $icon.after($loadingIcon); + $icon.addClass('hidden'); } else { - downloadButtonElement.removeClass('disabled'); - icon.attr('src', sourceImage.replace('loading-small.gif', 'actions/download.svg')); + $downloadButtonElement.find('.loading').remove(); + $downloadButtonElement.find('.icon').removeClass('hidden'); } }; diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js index be7dcc40b6e..3553d2d1aa0 100644 --- a/apps/files/js/newfilemenu.js +++ b/apps/files/js/newfilemenu.js @@ -27,7 +27,7 @@ var TEMPLATE_FILENAME_FORM = '<form class="filenameform">' + '<label class="hidden-visually" for="{{cid}}-input-{{fileType}}">{{fileName}}</label>' + - '<input id="{{cid}}-input-{{fileType}}" type="text" value="{{fileName}}">' + + '<input id="{{cid}}-input-{{fileType}}" type="text" value="{{fileName}}" autocomplete="off" autocapitalize="off" autocorrect="off">' + '</form>'; /** diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js index a2329a0b57d..56489fe30e4 100644 --- a/apps/files/l10n/ar.js +++ b/apps/files/l10n/ar.js @@ -56,6 +56,7 @@ OC.L10N.register( "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكن تحديث ملفاتك أو مزامنتها بعد الآن !", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "المساحة التخزينية لـ {owner} ممتلئة تقريبا ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ", + "Path" : "المسار", "Favorite" : "المفضلة", "Folder" : "مجلد", "New folder" : "مجلد جديد", diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json index fbc3f2e21d5..697c9627397 100644 --- a/apps/files/l10n/ar.json +++ b/apps/files/l10n/ar.json @@ -54,6 +54,7 @@ "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكن تحديث ملفاتك أو مزامنتها بعد الآن !", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "المساحة التخزينية لـ {owner} ممتلئة تقريبا ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ", + "Path" : "المسار", "Favorite" : "المفضلة", "Folder" : "مجلد", "New folder" : "مجلد جديد", diff --git a/apps/files/l10n/hy.js b/apps/files/l10n/hy.js index ecf99c1077f..c515b73db76 100644 --- a/apps/files/l10n/hy.js +++ b/apps/files/l10n/hy.js @@ -4,7 +4,7 @@ OC.L10N.register( "Files" : "Ֆայլեր", "All files" : "Բոլոր ֆայլերը", "Close" : "Փակել", - "Download" : "Բեռնել", + "Download" : "Ներբեռնել", "Rename" : "Վերանվանել", "Delete" : "Ջնջել", "Select" : "Նշել", @@ -18,7 +18,21 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n բայտ","%n բայտ"], "Folder" : "Պանակ", "New folder" : "Նոր պանակ", + "{newname} already exists" : "{newname} գոյություն ունի", + "Upload" : "Բեռնել", + "You created %1$s" : "Դու ստեղծեցիր %1$s", + "%2$s created %1$s" : "%2$s ստեղծեց %1$s", + "You changed %1$s" : "Դու փոխեցիր %1$s", + "%2$s changed %1$s" : "%2$s փոխեց %1$s", + "You deleted %1$s" : "Դու ջնջեցիր %1$s", + "%2$s deleted %1$s" : "%2$s ջնջեց %1$s", + "You restored %1$s" : "Դու վերականգնեցիր %1$s", + "%2$s restored %1$s" : "%2$s վերականգնեց %1$s", + "Changed by %2$s" : "Փոխվել է %2$sի կողմից", + "Deleted by %2$s" : "Ջնջվել է %2$sի կողմից", + "Restored by %2$s" : "Վերականգնվել է %2$sի կողմից", "Save" : "Պահպանել", + "No files in here" : "Ֆայլեր չկան այստեղ", "Select all" : "Նշել բոլորը", "Text file" : "Տեքստ ֆայլ", "New text file.txt" : "Նոր տեքստ ֆայլ.txt" diff --git a/apps/files/l10n/hy.json b/apps/files/l10n/hy.json index 8b23697b4a2..4376072e4b6 100644 --- a/apps/files/l10n/hy.json +++ b/apps/files/l10n/hy.json @@ -2,7 +2,7 @@ "Files" : "Ֆայլեր", "All files" : "Բոլոր ֆայլերը", "Close" : "Փակել", - "Download" : "Բեռնել", + "Download" : "Ներբեռնել", "Rename" : "Վերանվանել", "Delete" : "Ջնջել", "Select" : "Նշել", @@ -16,7 +16,21 @@ "_%n byte_::_%n bytes_" : ["%n բայտ","%n բայտ"], "Folder" : "Պանակ", "New folder" : "Նոր պանակ", + "{newname} already exists" : "{newname} գոյություն ունի", + "Upload" : "Բեռնել", + "You created %1$s" : "Դու ստեղծեցիր %1$s", + "%2$s created %1$s" : "%2$s ստեղծեց %1$s", + "You changed %1$s" : "Դու փոխեցիր %1$s", + "%2$s changed %1$s" : "%2$s փոխեց %1$s", + "You deleted %1$s" : "Դու ջնջեցիր %1$s", + "%2$s deleted %1$s" : "%2$s ջնջեց %1$s", + "You restored %1$s" : "Դու վերականգնեցիր %1$s", + "%2$s restored %1$s" : "%2$s վերականգնեց %1$s", + "Changed by %2$s" : "Փոխվել է %2$sի կողմից", + "Deleted by %2$s" : "Ջնջվել է %2$sի կողմից", + "Restored by %2$s" : "Վերականգնվել է %2$sի կողմից", "Save" : "Պահպանել", + "No files in here" : "Ֆայլեր չկան այստեղ", "Select all" : "Նշել բոլորը", "Text file" : "Տեքստ ֆայլ", "New text file.txt" : "Նոր տեքստ ֆայլ.txt" diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js index 3bac96b5eb8..741a71405db 100644 --- a/apps/files/l10n/ko.js +++ b/apps/files/l10n/ko.js @@ -28,6 +28,7 @@ OC.L10N.register( "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.", "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함", "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다", + "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\"을(를) 업로드할 수 없음: {message}", "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.", "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", "Actions" : "작업", @@ -42,6 +43,17 @@ OC.L10N.register( "Unable to determine date" : "날짜를 결정할 수 없음", "This operation is forbidden" : "이 작업이 금지됨", "This directory is unavailable, please check the logs or contact the administrator" : "디렉터리를 사용할 수 없습니다. 로그를 확인하거나 관리자에게 연락하십시오", + "Could not move \"{file}\", target exists" : "\"{file}\"을(를) 이동할 수 없음, 대상이 존재함", + "Could not move \"{file}\"" : "\"{file}\"을(를) 이동할 수 없음", + "{newName} already exists" : "{newName}이(가) 이미 존재함", + "Could not rename \"{fileName}\", it does not exist any more" : "\"{fileName}\"의 이름을 변경할 수 없음, 더 이상 존재하지 않음", + "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "\"{dir}\" 폴더 내에 \"{targetName}\" 파일이 이미 있습니다. 다른 이름을 사용하십시오.", + "Could not rename \"{fileName}\"" : "\"{fileName}\"의 이름을 바꿀 수 없음", + "Could not create file \"{file}\"" : "\"{file}\"을(를) 만들 수 없음", + "Could not create file \"{file}\" because it already exists" : "파일이 이미 존재하므로 \"{file}\"을(를) 만들 수 없음", + "Could not create folder \"{dir}\"" : "폴더 \"{dir}\"을(를) 만들 수 없음", + "Could not create folder \"{dir}\" because it already exists" : "폴더가 이미 존재하므로 폴더 \"{dir}\"을(를) 만들 수 없음", + "Error deleting file \"{fileName}\"." : "파일 \"{fileName}\"을(를) 삭제할 수 없습니다.", "No entries in this folder match '{filter}'" : "이 폴더에 '{filter}'와(과) 일치하는 항목 없음", "Name" : "이름", "Size" : "크기", @@ -90,6 +102,8 @@ OC.L10N.register( "Maximum upload size" : "최대 업로드 크기", "max. possible: " : "최대 가능:", "Save" : "저장", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "PHP-FPM을 사용 중이면 변경 사항이 적용되는 데 최대 5분 정도 걸릴 수 있습니다.", + "Missing permissions to edit from here." : "여기에서 편집할 권한이 없습니다.", "Settings" : "설정", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>", diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json index e42745fc8b4..fa7e7f06c90 100644 --- a/apps/files/l10n/ko.json +++ b/apps/files/l10n/ko.json @@ -26,6 +26,7 @@ "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.", "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함", "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다", + "Error uploading file \"{fileName}\": {message}" : "\"{fileName}\"을(를) 업로드할 수 없음: {message}", "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.", "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", "Actions" : "작업", @@ -40,6 +41,17 @@ "Unable to determine date" : "날짜를 결정할 수 없음", "This operation is forbidden" : "이 작업이 금지됨", "This directory is unavailable, please check the logs or contact the administrator" : "디렉터리를 사용할 수 없습니다. 로그를 확인하거나 관리자에게 연락하십시오", + "Could not move \"{file}\", target exists" : "\"{file}\"을(를) 이동할 수 없음, 대상이 존재함", + "Could not move \"{file}\"" : "\"{file}\"을(를) 이동할 수 없음", + "{newName} already exists" : "{newName}이(가) 이미 존재함", + "Could not rename \"{fileName}\", it does not exist any more" : "\"{fileName}\"의 이름을 변경할 수 없음, 더 이상 존재하지 않음", + "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "\"{dir}\" 폴더 내에 \"{targetName}\" 파일이 이미 있습니다. 다른 이름을 사용하십시오.", + "Could not rename \"{fileName}\"" : "\"{fileName}\"의 이름을 바꿀 수 없음", + "Could not create file \"{file}\"" : "\"{file}\"을(를) 만들 수 없음", + "Could not create file \"{file}\" because it already exists" : "파일이 이미 존재하므로 \"{file}\"을(를) 만들 수 없음", + "Could not create folder \"{dir}\"" : "폴더 \"{dir}\"을(를) 만들 수 없음", + "Could not create folder \"{dir}\" because it already exists" : "폴더가 이미 존재하므로 폴더 \"{dir}\"을(를) 만들 수 없음", + "Error deleting file \"{fileName}\"." : "파일 \"{fileName}\"을(를) 삭제할 수 없습니다.", "No entries in this folder match '{filter}'" : "이 폴더에 '{filter}'와(과) 일치하는 항목 없음", "Name" : "이름", "Size" : "크기", @@ -88,6 +100,8 @@ "Maximum upload size" : "최대 업로드 크기", "max. possible: " : "최대 가능:", "Save" : "저장", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "PHP-FPM을 사용 중이면 변경 사항이 적용되는 데 최대 5분 정도 걸릴 수 있습니다.", + "Missing permissions to edit from here." : "여기에서 편집할 권한이 없습니다.", "Settings" : "설정", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>", diff --git a/apps/files/l10n/ne.js b/apps/files/l10n/ne.js deleted file mode 100644 index 7988332fa91..00000000000 --- a/apps/files/l10n/ne.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "files", - { - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/ne.json b/apps/files/l10n/ne.json deleted file mode 100644 index ef5fc586755..00000000000 --- a/apps/files/l10n/ne.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index 79c49400723..58c06acbe53 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -50,9 +50,9 @@ OC.L10N.register( "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "De naam \"{targetName}\" bestaat al in map \"{dir}\". Kies een andere naam.", "Could not rename \"{fileName}\"" : "Kon \"{fileName}\" niet hernoemen", "Could not create file \"{file}\"" : "Kon \"{file}\" niet aanmaken", - "Could not create file \"{file}\" because it already exists" : "Kon \"{file}\" niet aanmaken omdat het al bestaat", + "Could not create file \"{file}\" because it already exists" : "Kon \"{file}\" niet aanmaken, omdat het al bestaat", "Could not create folder \"{dir}\"" : "Kon map \"{dir}\" niet aanmaken", - "Could not create folder \"{dir}\" because it already exists" : "Kon map \"{dir}\" niet aanmaken omdat die al bestaat", + "Could not create folder \"{dir}\" because it already exists" : "Kon map \"{dir}\" niet aanmaken, omdat die al bestaat", "Error deleting file \"{fileName}\"." : "Fout bij verwijderen bestand \"{fileName}\".", "No entries in this folder match '{filter}'" : "Niets in deze map komt overeen met '{filter}'", "Name" : "Naam", @@ -114,7 +114,7 @@ OC.L10N.register( "Upload too large" : "Upload is te groot", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.", "No favorites" : "Geen favorieten", - "Files and folders you mark as favorite will show up here" : "Bestanden en mappen die u favoriet vindt worden hier getoont", + "Files and folders you mark as favorite will show up here" : "Bestanden en mappen die u favoriet vindt, worden hier getoond", "Text file" : "Tekstbestand", "New text file.txt" : "Nieuw tekstbestand.txt" }, diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index 9cf0326d216..9c94151fb4c 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -48,9 +48,9 @@ "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "De naam \"{targetName}\" bestaat al in map \"{dir}\". Kies een andere naam.", "Could not rename \"{fileName}\"" : "Kon \"{fileName}\" niet hernoemen", "Could not create file \"{file}\"" : "Kon \"{file}\" niet aanmaken", - "Could not create file \"{file}\" because it already exists" : "Kon \"{file}\" niet aanmaken omdat het al bestaat", + "Could not create file \"{file}\" because it already exists" : "Kon \"{file}\" niet aanmaken, omdat het al bestaat", "Could not create folder \"{dir}\"" : "Kon map \"{dir}\" niet aanmaken", - "Could not create folder \"{dir}\" because it already exists" : "Kon map \"{dir}\" niet aanmaken omdat die al bestaat", + "Could not create folder \"{dir}\" because it already exists" : "Kon map \"{dir}\" niet aanmaken, omdat die al bestaat", "Error deleting file \"{fileName}\"." : "Fout bij verwijderen bestand \"{fileName}\".", "No entries in this folder match '{filter}'" : "Niets in deze map komt overeen met '{filter}'", "Name" : "Naam", @@ -112,7 +112,7 @@ "Upload too large" : "Upload is te groot", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.", "No favorites" : "Geen favorieten", - "Files and folders you mark as favorite will show up here" : "Bestanden en mappen die u favoriet vindt worden hier getoont", + "Files and folders you mark as favorite will show up here" : "Bestanden en mappen die u favoriet vindt, worden hier getoond", "Text file" : "Tekstbestand", "New text file.txt" : "Nieuw tekstbestand.txt" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files/l10n/or_IN.js b/apps/files/l10n/or_IN.js deleted file mode 100644 index 7988332fa91..00000000000 --- a/apps/files/l10n/or_IN.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "files", - { - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/or_IN.json b/apps/files/l10n/or_IN.json deleted file mode 100644 index ef5fc586755..00000000000 --- a/apps/files/l10n/or_IN.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js index e28b7bc2581..6513707cad1 100644 --- a/apps/files/l10n/pl.js +++ b/apps/files/l10n/pl.js @@ -40,6 +40,7 @@ OC.L10N.register( "Select" : "Wybierz", "Pending" : "Oczekujące", "Unable to determine date" : "Nie można ustalić daty", + "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.", "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'", "Name" : "Nazwa", "Size" : "Rozmiar", @@ -74,6 +75,7 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s usunął %1$s", "You restored %1$s" : "Przywróciłeś %1$s", "%2$s restored %1$s" : "%2$s przywrócił %1$s", + "Changed by %2$s" : "Zmienione przez %2$s", "Upload (max. %s)" : "Wysyłka (max. %s)", "File handling" : "Zarządzanie plikami", "Maximum upload size" : "Maksymalny rozmiar wysyłanego pliku", diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json index 314caeb807a..7fd95619b17 100644 --- a/apps/files/l10n/pl.json +++ b/apps/files/l10n/pl.json @@ -38,6 +38,7 @@ "Select" : "Wybierz", "Pending" : "Oczekujące", "Unable to determine date" : "Nie można ustalić daty", + "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.", "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'", "Name" : "Nazwa", "Size" : "Rozmiar", @@ -72,6 +73,7 @@ "%2$s deleted %1$s" : "%2$s usunął %1$s", "You restored %1$s" : "Przywróciłeś %1$s", "%2$s restored %1$s" : "%2$s przywrócił %1$s", + "Changed by %2$s" : "Zmienione przez %2$s", "Upload (max. %s)" : "Wysyłka (max. %s)", "File handling" : "Zarządzanie plikami", "Maximum upload size" : "Maksymalny rozmiar wysyłanego pliku", diff --git a/apps/files/l10n/uz.js b/apps/files/l10n/uz.js deleted file mode 100644 index 91d52801985..00000000000 --- a/apps/files/l10n/uz.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "files", - { - "_%n folder_::_%n folders_" : [""], - "_%n file_::_%n files_" : [""], - "_Uploading %n file_::_Uploading %n files_" : [""], - "_matches '{filter}'_::_match '{filter}'_" : [""] -}, -"nplurals=1; plural=0;"); diff --git a/apps/files/l10n/uz.json b/apps/files/l10n/uz.json deleted file mode 100644 index 82cca5a0661..00000000000 --- a/apps/files/l10n/uz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "_%n folder_::_%n folders_" : [""], - "_%n file_::_%n files_" : [""], - "_Uploading %n file_::_Uploading %n files_" : [""], - "_matches '{filter}'_::_match '{filter}'_" : [""] -},"pluralForm" :"nplurals=1; plural=0;" -}
\ No newline at end of file diff --git a/apps/files/l10n/yo.js b/apps/files/l10n/yo.js deleted file mode 100644 index 7988332fa91..00000000000 --- a/apps/files/l10n/yo.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "files", - { - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/yo.json b/apps/files/l10n/yo.json deleted file mode 100644 index ef5fc586755..00000000000 --- a/apps/files/l10n/yo.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""], - "_matches '{filter}'_::_match '{filter}'_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files/lib/backgroundjob/cleanupfilelocks.php b/apps/files/lib/backgroundjob/cleanupfilelocks.php new file mode 100644 index 00000000000..b5cf8e94551 --- /dev/null +++ b/apps/files/lib/backgroundjob/cleanupfilelocks.php @@ -0,0 +1,57 @@ +<?php +/** + * @author Morris Jobke <hey@morrisjobke.de> + * + * @copyright Copyright (c) 2016, 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\BackgroundJob; + +use OC\BackgroundJob\TimedJob; +use OC\Lock\DBLockingProvider; + +/** + * Clean up all file locks that are expired for the DB file locking provider + */ +class CleanupFileLocks extends TimedJob { + + /** + * Default interval in minutes + * + * @var int $defaultIntervalMin + **/ + protected $defaultIntervalMin = 5; + + /** + * sets the correct interval for this timed job + */ + public function __construct() { + $this->interval = $this->defaultIntervalMin * 60; + } + + /** + * Makes the background job do its work + * + * @param array $argument unused argument + */ + public function run($argument) { + $lockingProvider = \OC::$server->getLockingProvider(); + if($lockingProvider instanceof DBLockingProvider) { + $lockingProvider->cleanExpiredLocks(); + } + } +} diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js index 470f2854f43..3f46a27d1f9 100644 --- a/apps/files/tests/js/fileactionsSpec.js +++ b/apps/files/tests/js/fileactionsSpec.js @@ -656,4 +656,24 @@ describe('OCA.Files.FileActions tests', function() { }); }); }); + describe('download spinner', function() { + var FileActions = OCA.Files.FileActions; + var $el; + + beforeEach(function() { + $el = $('<a href="#"><span class="icon icon-download"></span><span>Download</span></a>'); + }); + + it('replaces download icon with spinner', function() { + FileActions.updateFileActionSpinner($el, true); + expect($el.find('.icon.loading').length).toEqual(1); + expect($el.find('.icon.icon-download').hasClass('hidden')).toEqual(true); + }); + it('replaces spinner back with download icon with spinner', function() { + FileActions.updateFileActionSpinner($el, true); + FileActions.updateFileActionSpinner($el, false); + expect($el.find('.icon.loading').length).toEqual(0); + expect($el.find('.icon.icon-download').hasClass('hidden')).toEqual(false); + }); + }); }); diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index 135e9a44eb8..cbe2f98d6b8 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -13,14 +13,18 @@ OC.L10N.register( "Objectstore forbidden" : "Objekt nicht erlaubt", "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“", "Not permitted to use backend \"%s\"" : "Es ist nicht zulässig Backend \"%s\" zu verwenden", + "Not permitted to use authentication mechanism \"%s\"" : "Nicht erlaubter Autentifizierungsmechanismus \"%s\"", "Unsatisfied backend parameters" : "Unbefriedigende Backend-Parameter", + "Unsatisfied authentication mechanism parameters" : "Unbefriedigende Autentifizierungs-Mechanismus Parameter", "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Der Speicher mit der ID „%i“ ist nicht bearbeitbar durch Benutzer", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim Konfigurieren von OAuth1", + "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "Enable encryption" : "Verschlüsselung aktivieren", @@ -31,12 +35,19 @@ OC.L10N.register( "Once every direct access" : "Einmal bei jedem Direktzugriff", "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", + "Admin defined" : "Administrator definiert", "Saved" : "Gespeichert", "Empty response from the server" : "Leere Antwort vom Server erhalten", + "Couldn't get the list of external mount points: {type}" : "Konnte die Liste von externen Speichern nicht laden: {type}", + "There was an error with message: " : "Ein Fehler ist aufgetreten:", "External mount error" : "Externer Einhängefehler", "external-storage" : "externer Speicher", + "Please enter the credentials for the {mount} mount" : "Bitte geben Sie die Zugangsdaten für den {mount} Speicher an", "Username" : "Benutzername", "Password" : "Passwort", + "Credentials saved" : "Zugangsdaten gespeichert", + "Credentials saving failed" : "Speichern der Zugangsdaten fehlgeschlagen", + "Credentials required" : "Zugangsdaten benötigt", "Save" : "Speichern", "Access key" : "Zugangsschlüssel", "Secret key" : "geheimer Schlüssel", @@ -53,6 +64,8 @@ OC.L10N.register( "Rackspace" : "Rackspace", "API key" : "API-Schlüssel", "Username and password" : "Benutzername und Passwort", + "Log-in credentials, save in session" : "Anmelde-Zugangsdaten, speichere in Sitzung", + "RSA public key" : "RSA öffentlicher Schlüssel", "Public key" : "Öffentlicher Schlüssel", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -83,6 +96,7 @@ OC.L10N.register( "Username as share" : "Benutzername als Freigabe", "OpenStack Object Storage" : "Openstack-Objektspeicher", "Service name" : "Dienst Name", + "Request timeout (seconds)" : "Anfrage-Zeitüberschreitung (Sekunden)", "<b>Note:</b> " : "<b>Hinweis:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index 956d202ff72..a4e3d1f7306 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -11,14 +11,18 @@ "Objectstore forbidden" : "Objekt nicht erlaubt", "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“", "Not permitted to use backend \"%s\"" : "Es ist nicht zulässig Backend \"%s\" zu verwenden", + "Not permitted to use authentication mechanism \"%s\"" : "Nicht erlaubter Autentifizierungsmechanismus \"%s\"", "Unsatisfied backend parameters" : "Unbefriedigende Backend-Parameter", + "Unsatisfied authentication mechanism parameters" : "Unbefriedigende Autentifizierungs-Mechanismus Parameter", "Insufficient data: %s" : "Unzureichende Daten: %s", "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "Der Speicher mit der ID „%i“ ist nicht bearbeitbar durch Benutzer", "Personal" : "Persönlich", "System" : "System", "Grant access" : "Zugriff gestatten", "Access granted" : "Zugriff gestattet", "Error configuring OAuth1" : "Fehler beim Konfigurieren von OAuth1", + "Error configuring OAuth2" : "Fehler beim Konfigurieren von OAuth2", "Generate keys" : "Schlüssel erzeugen", "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares", "Enable encryption" : "Verschlüsselung aktivieren", @@ -29,12 +33,19 @@ "Once every direct access" : "Einmal bei jedem Direktzugriff", "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.", "(group)" : "(group)", + "Admin defined" : "Administrator definiert", "Saved" : "Gespeichert", "Empty response from the server" : "Leere Antwort vom Server erhalten", + "Couldn't get the list of external mount points: {type}" : "Konnte die Liste von externen Speichern nicht laden: {type}", + "There was an error with message: " : "Ein Fehler ist aufgetreten:", "External mount error" : "Externer Einhängefehler", "external-storage" : "externer Speicher", + "Please enter the credentials for the {mount} mount" : "Bitte geben Sie die Zugangsdaten für den {mount} Speicher an", "Username" : "Benutzername", "Password" : "Passwort", + "Credentials saved" : "Zugangsdaten gespeichert", + "Credentials saving failed" : "Speichern der Zugangsdaten fehlgeschlagen", + "Credentials required" : "Zugangsdaten benötigt", "Save" : "Speichern", "Access key" : "Zugangsschlüssel", "Secret key" : "geheimer Schlüssel", @@ -51,6 +62,8 @@ "Rackspace" : "Rackspace", "API key" : "API-Schlüssel", "Username and password" : "Benutzername und Passwort", + "Log-in credentials, save in session" : "Anmelde-Zugangsdaten, speichere in Sitzung", + "RSA public key" : "RSA öffentlicher Schlüssel", "Public key" : "Öffentlicher Schlüssel", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -81,6 +94,7 @@ "Username as share" : "Benutzername als Freigabe", "OpenStack Object Storage" : "Openstack-Objektspeicher", "Service name" : "Dienst Name", + "Request timeout (seconds)" : "Anfrage-Zeitüberschreitung (Sekunden)", "<b>Note:</b> " : "<b>Hinweis:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.", diff --git a/apps/files_external/l10n/fil.js b/apps/files_external/l10n/fil.js new file mode 100644 index 00000000000..e049851ae50 --- /dev/null +++ b/apps/files_external/l10n/fil.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "files_external", + { + "Username" : "Username", + "Password" : "Password" +}, +"nplurals=2; plural=(n > 1);"); diff --git a/apps/files_external/l10n/fil.json b/apps/files_external/l10n/fil.json new file mode 100644 index 00000000000..95d8e5f9717 --- /dev/null +++ b/apps/files_external/l10n/fil.json @@ -0,0 +1,5 @@ +{ "translations": { + "Username" : "Username", + "Password" : "Password" +},"pluralForm" :"nplurals=2; plural=(n > 1);" +}
\ No newline at end of file diff --git a/apps/files_external/l10n/hy.js b/apps/files_external/l10n/hy.js index 1a5ef39ab42..9de18052e45 100644 --- a/apps/files_external/l10n/hy.js +++ b/apps/files_external/l10n/hy.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Personal" : "Անձնական", "Never" : "Երբեք", + "Saved" : "Պահված", "Username" : "Օգտանուն", "Password" : "Գաղտնաբառ", "Save" : "Պահպանել", diff --git a/apps/files_external/l10n/hy.json b/apps/files_external/l10n/hy.json index 20dd743844d..d5b5ca52112 100644 --- a/apps/files_external/l10n/hy.json +++ b/apps/files_external/l10n/hy.json @@ -1,6 +1,7 @@ { "translations": { "Personal" : "Անձնական", "Never" : "Երբեք", + "Saved" : "Պահված", "Username" : "Օգտանուն", "Password" : "Գաղտնաբառ", "Save" : "Պահպանել", diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js index 08961646a97..921c647288f 100644 --- a/apps/files_external/l10n/ko.js +++ b/apps/files_external/l10n/ko.js @@ -17,6 +17,8 @@ OC.L10N.register( "Unsatisfied backend parameters" : "백엔드 인자가 부족함", "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함", "Insufficient data: %s" : "충분하지 않은 데이터: %s", + "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "저장소 ID \"%i\"을(를) 사용자가 편집할 수 없음", "Personal" : "개인", "System" : "시스템", "Grant access" : "접근 권한 부여", @@ -27,14 +29,29 @@ OC.L10N.register( "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생", "Enable encryption" : "암호화 사용", "Enable previews" : "미리 보기 사용", + "Enable sharing" : "공유 사용", "Check for changes" : "변경 사항 감시", "Never" : "하지 않음", "Once every direct access" : "한 번 직접 접근할 때마다", "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오", "(group)" : "(그룹)", + "Admin defined" : "관리자 지정", "Saved" : "저장됨", + "Empty response from the server" : "서버에서 빈 응답이 돌아옴", + "Couldn't access. Please logout and login to activate this mount point" : "접근할 수 없습니다. 이 마운트 지점을 활성화하려면 로그아웃 후 로그인하십시오", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud 서버에서 정보를 가져올 수 없음: {code} {type}", + "Couldn't get the list of external mount points: {type}" : "외부 마운트 지점 목록을 가져올 수 없음: {type}", + "There was an error with message: " : "오류 메시지: ", + "External mount error" : "외부 마운트 오류", + "external-storage" : "external-storage", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows 네트워크 드라이브 마운트 지점 목록을 가져올 수 없음: 서버에서 빈 응답이 돌아옴", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "일부 외부 마운트 지점을 연결할 수 없습니다. 빨간색으로 표시된 줄을 눌러서 더 많은 정보를 확인하십시오", + "Please enter the credentials for the {mount} mount" : "{mount} 마운트 인증 정보를 입력하십시오", "Username" : "사용자 이름", "Password" : "암호", + "Credentials saved" : "인증 정보 저장됨", + "Credentials saving failed" : "인증 정보를 저장할 수 없음", + "Credentials required" : "인증 정보 필요함", "Save" : "저장", "Access key" : "접근 키", "Secret key" : "비밀 키", @@ -52,6 +69,7 @@ OC.L10N.register( "Rackspace" : "Rackspace", "API key" : "API 키", "Username and password" : "사용자 이름과 암호", + "Log-in credentials, save in session" : "로그인 인증 정보, 세션에 저장됨", "RSA public key" : "RSA 공개 키", "Public key" : "공개 키", "Amazon S3" : "Amazon S3", diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json index 5c23716eb0f..9e15abb6160 100644 --- a/apps/files_external/l10n/ko.json +++ b/apps/files_external/l10n/ko.json @@ -15,6 +15,8 @@ "Unsatisfied backend parameters" : "백엔드 인자가 부족함", "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함", "Insufficient data: %s" : "충분하지 않은 데이터: %s", + "%s" : "%s", + "Storage with id \"%i\" is not user editable" : "저장소 ID \"%i\"을(를) 사용자가 편집할 수 없음", "Personal" : "개인", "System" : "시스템", "Grant access" : "접근 권한 부여", @@ -25,14 +27,29 @@ "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생", "Enable encryption" : "암호화 사용", "Enable previews" : "미리 보기 사용", + "Enable sharing" : "공유 사용", "Check for changes" : "변경 사항 감시", "Never" : "하지 않음", "Once every direct access" : "한 번 직접 접근할 때마다", "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오", "(group)" : "(그룹)", + "Admin defined" : "관리자 지정", "Saved" : "저장됨", + "Empty response from the server" : "서버에서 빈 응답이 돌아옴", + "Couldn't access. Please logout and login to activate this mount point" : "접근할 수 없습니다. 이 마운트 지점을 활성화하려면 로그아웃 후 로그인하십시오", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud 서버에서 정보를 가져올 수 없음: {code} {type}", + "Couldn't get the list of external mount points: {type}" : "외부 마운트 지점 목록을 가져올 수 없음: {type}", + "There was an error with message: " : "오류 메시지: ", + "External mount error" : "외부 마운트 오류", + "external-storage" : "external-storage", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Windows 네트워크 드라이브 마운트 지점 목록을 가져올 수 없음: 서버에서 빈 응답이 돌아옴", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "일부 외부 마운트 지점을 연결할 수 없습니다. 빨간색으로 표시된 줄을 눌러서 더 많은 정보를 확인하십시오", + "Please enter the credentials for the {mount} mount" : "{mount} 마운트 인증 정보를 입력하십시오", "Username" : "사용자 이름", "Password" : "암호", + "Credentials saved" : "인증 정보 저장됨", + "Credentials saving failed" : "인증 정보를 저장할 수 없음", + "Credentials required" : "인증 정보 필요함", "Save" : "저장", "Access key" : "접근 키", "Secret key" : "비밀 키", @@ -50,6 +67,7 @@ "Rackspace" : "Rackspace", "API key" : "API 키", "Username and password" : "사용자 이름과 암호", + "Log-in credentials, save in session" : "로그인 인증 정보, 세션에 저장됨", "RSA public key" : "RSA 공개 키", "Public key" : "공개 키", "Amazon S3" : "Amazon S3", diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js index 6e073cf682e..db10f28b984 100644 --- a/apps/files_external/l10n/nl.js +++ b/apps/files_external/l10n/nl.js @@ -45,7 +45,7 @@ OC.L10N.register( "External mount error" : "Extern koppelpunt fout", "external-storage" : "externe opslag", "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Kon geen overzicht met Windows netwerk koppelpunten krijgen: lege reactie van de server", - "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Sommige van de geconfigureerde koppelpunten zijn niet verbonden. Klok op de rode rij(en) voor meer informatie", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Sommige van de geconfigureerde koppelpunten zijn niet verbonden. Klik op de rode rij(en) voor meer informatie", "Please enter the credentials for the {mount} mount" : "Geef de inloggegeven sop voor de {mount} mount", "Username" : "Gebruikersnaam", "Password" : "Wachtwoord", diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json index 72f822d7f6d..3afd320905a 100644 --- a/apps/files_external/l10n/nl.json +++ b/apps/files_external/l10n/nl.json @@ -43,7 +43,7 @@ "External mount error" : "Extern koppelpunt fout", "external-storage" : "externe opslag", "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Kon geen overzicht met Windows netwerk koppelpunten krijgen: lege reactie van de server", - "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Sommige van de geconfigureerde koppelpunten zijn niet verbonden. Klok op de rode rij(en) voor meer informatie", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Sommige van de geconfigureerde koppelpunten zijn niet verbonden. Klik op de rode rij(en) voor meer informatie", "Please enter the credentials for the {mount} mount" : "Geef de inloggegeven sop voor de {mount} mount", "Username" : "Gebruikersnaam", "Password" : "Wachtwoord", diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js index f79309ff592..e8c64830073 100644 --- a/apps/files_external/l10n/pl.js +++ b/apps/files_external/l10n/pl.js @@ -30,6 +30,7 @@ OC.L10N.register( "Client ID" : "ID klienta", "Client secret" : "Hasło klienta", "API key" : "Klucz API", + "RSA public key" : "Klucz publiczny RSA", "Public key" : "Klucz publiczny", "Amazon S3" : "Amazon S3", "Bucket" : "Kosz", diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json index 05ad6219e48..7420ff8ac34 100644 --- a/apps/files_external/l10n/pl.json +++ b/apps/files_external/l10n/pl.json @@ -28,6 +28,7 @@ "Client ID" : "ID klienta", "Client secret" : "Hasło klienta", "API key" : "Klucz API", + "RSA public key" : "Klucz publiczny RSA", "Public key" : "Klucz publiczny", "Amazon S3" : "Amazon S3", "Bucket" : "Kosz", diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js index 09ed491559a..cdb84ab4095 100644 --- a/apps/files_external/l10n/sl.js +++ b/apps/files_external/l10n/sl.js @@ -19,15 +19,22 @@ OC.L10N.register( "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev", "Enable encryption" : "Omogoči šifriranje", "Enable previews" : "Omogoči predogled", + "Enable sharing" : "Omogoči souporabo", "Check for changes" : "Preveri za spremembe", "Never" : "Nikoli", "Once every direct access" : "Enkrat ob neposrednem dostopu", "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.", "(group)" : "(skupina)", "Saved" : "Shranjeno", + "There was an error with message: " : "Prišlo je do napake s sporočilom:", "External mount error" : "Notranja napaka priklopa", + "external-storage" : "zunanja-shramba", + "Please enter the credentials for the {mount} mount" : "Vpišite poverila za priklopno točko {mount}", "Username" : "Uporabniško ime", "Password" : "Geslo", + "Credentials saved" : "Poverila so shranjena", + "Credentials saving failed" : "Shranjevanje poveril je spodletelo", + "Credentials required" : "Zahtevana so poverila", "Save" : "Shrani", "Access key" : "Ključ za dostop", "Secret key" : "Skriti ključ", @@ -41,6 +48,7 @@ OC.L10N.register( "Client secret" : "Skrivni ključ odjemalca", "OpenStack" : "OpenStack", "Tenant name" : "Ime uporabnika", + "Identity endpoint URL" : "Naslov URL končne točke istovetnosti", "API key" : "Ključ API", "Username and password" : "Uporabniško ime in geslo", "RSA public key" : "Javni ključ RSA", diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json index 4aefcc681dd..c81ba62b789 100644 --- a/apps/files_external/l10n/sl.json +++ b/apps/files_external/l10n/sl.json @@ -17,15 +17,22 @@ "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev", "Enable encryption" : "Omogoči šifriranje", "Enable previews" : "Omogoči predogled", + "Enable sharing" : "Omogoči souporabo", "Check for changes" : "Preveri za spremembe", "Never" : "Nikoli", "Once every direct access" : "Enkrat ob neposrednem dostopu", "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.", "(group)" : "(skupina)", "Saved" : "Shranjeno", + "There was an error with message: " : "Prišlo je do napake s sporočilom:", "External mount error" : "Notranja napaka priklopa", + "external-storage" : "zunanja-shramba", + "Please enter the credentials for the {mount} mount" : "Vpišite poverila za priklopno točko {mount}", "Username" : "Uporabniško ime", "Password" : "Geslo", + "Credentials saved" : "Poverila so shranjena", + "Credentials saving failed" : "Shranjevanje poveril je spodletelo", + "Credentials required" : "Zahtevana so poverila", "Save" : "Shrani", "Access key" : "Ključ za dostop", "Secret key" : "Skriti ključ", @@ -39,6 +46,7 @@ "Client secret" : "Skrivni ključ odjemalca", "OpenStack" : "OpenStack", "Tenant name" : "Ime uporabnika", + "Identity endpoint URL" : "Naslov URL končne točke istovetnosti", "API key" : "Ključ API", "Username and password" : "Uporabniško ime in geslo", "RSA public key" : "Javni ključ RSA", diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js index ca9d0fcc612..53b8dad45f1 100644 --- a/apps/files_external/l10n/sr.js +++ b/apps/files_external/l10n/sr.js @@ -15,6 +15,7 @@ OC.L10N.register( "Error generating key pair" : "Грешка при генерисању пара кључева", "Enable encryption" : "Укључи шифровање", "Enable previews" : "Укључи прегледе", + "Enable sharing" : "Укључи дељење", "Check for changes" : "Провери измене", "Never" : "никад", "Once every direct access" : "једном при сваком директном приступу", @@ -48,11 +49,16 @@ OC.L10N.register( "Local" : "локална", "Location" : "Локација", "ownCloud" : "оунКлауд", + "SFTP" : "СФТП", + "Root" : "Корен", "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа", + "SMB / CIFS" : "ЦМБ/ЦИФС", "Share" : "Дели", + "Domain" : "Домен", "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву", "Username as share" : "Корисничко име као дељење", "OpenStack Object Storage" : "OpenStack Object Storage", + "Service name" : "Назив услуге", "<b>Note:</b> " : "<b>Напомена:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> cURL подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> ФТП подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", @@ -64,6 +70,7 @@ OC.L10N.register( "Scope" : "Распон", "External Storage" : "Спољашње складиште", "Folder name" : "Назив фасцикле", + "Authentication" : "Аутентификација", "Configuration" : "Подешавање", "Available for" : "Доступно за", "Add storage" : "Додај складиште", diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json index 5d694fd97d7..a5b84eea915 100644 --- a/apps/files_external/l10n/sr.json +++ b/apps/files_external/l10n/sr.json @@ -13,6 +13,7 @@ "Error generating key pair" : "Грешка при генерисању пара кључева", "Enable encryption" : "Укључи шифровање", "Enable previews" : "Укључи прегледе", + "Enable sharing" : "Укључи дељење", "Check for changes" : "Провери измене", "Never" : "никад", "Once every direct access" : "једном при сваком директном приступу", @@ -46,11 +47,16 @@ "Local" : "локална", "Location" : "Локација", "ownCloud" : "оунКлауд", + "SFTP" : "СФТП", + "Root" : "Корен", "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа", + "SMB / CIFS" : "ЦМБ/ЦИФС", "Share" : "Дели", + "Domain" : "Домен", "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву", "Username as share" : "Корисничко име као дељење", "OpenStack Object Storage" : "OpenStack Object Storage", + "Service name" : "Назив услуге", "<b>Note:</b> " : "<b>Напомена:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> cURL подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> ФТП подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.", @@ -62,6 +68,7 @@ "Scope" : "Распон", "External Storage" : "Спољашње складиште", "Folder name" : "Назив фасцикле", + "Authentication" : "Аутентификација", "Configuration" : "Подешавање", "Available for" : "Доступно за", "Add storage" : "Додај складиште", diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js index 0f00952e855..9582a5a2180 100644 --- a/apps/files_external/l10n/zh_CN.js +++ b/apps/files_external/l10n/zh_CN.js @@ -4,22 +4,32 @@ OC.L10N.register( "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s", "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s", "External storage" : "外部存储", + "Invalid mount point" : "无效的挂载点", + "%s" : "%s", "Personal" : "个人", "System" : "系统", "Grant access" : "授权", "Access granted" : "权限已授予。", "Enable encryption" : "启用加密", + "Enable previews" : "启用预览", + "Enable sharing" : "启用分享", "Never" : "从不", "Saved" : "已保存", + "External mount error" : "外部挂载错误", "external-storage" : "外部存储", "Username" : "用户名", "Password" : "密码", "Save" : "保存", "Access key" : "Access key", "Secret key" : "Secret key", + "Builtin" : "内置", "None" : "无", "API key" : "API密匙", + "Username and password" : "用户名和密码", + "RSA public key" : "RSA 公钥", + "Public key" : "公钥", "Amazon S3" : "Amazon S3", + "Hostname" : "主机名", "Port" : "端口", "Region" : "地区", "Enable SSL" : "启用 SSL", @@ -39,11 +49,17 @@ OC.L10N.register( "SFTP" : "SFTP", "Root" : "根路径", "SFTP with secret key login" : "包含secret key的SFTP", + "SMB / CIFS" : "SMB / CIFS", "Share" : "共享", "Domain" : "域名", "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息", "OpenStack Object Storage" : "OpenStack 对象存储", "<b>Note:</b> " : "<b>注意：</b>", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b> PHP 中的 cURL 支持未启用或未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b> PHP 中的 FTP 支持未启用或未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b>“%s”尚未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "No external storage configured" : "未配置外部存储", + "You can add external storages in the personal settings" : "您可以在个人设置中添加外部存储", "Name" : "名称", "Storage type" : "存储类型", "Scope" : "适用范围", @@ -55,6 +71,7 @@ OC.L10N.register( "Add storage" : "增加存储", "Advanced settings" : "高级选项", "Delete" : "删除", + "Allow users to mount external storage" : "允许用户挂载外部存储", "Allow users to mount the following external storage" : "允许用户挂载以下外部存储" }, "nplurals=1; plural=0;"); diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json index bbdc3beaf01..1c8ae2f0697 100644 --- a/apps/files_external/l10n/zh_CN.json +++ b/apps/files_external/l10n/zh_CN.json @@ -2,22 +2,32 @@ "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s", "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s", "External storage" : "外部存储", + "Invalid mount point" : "无效的挂载点", + "%s" : "%s", "Personal" : "个人", "System" : "系统", "Grant access" : "授权", "Access granted" : "权限已授予。", "Enable encryption" : "启用加密", + "Enable previews" : "启用预览", + "Enable sharing" : "启用分享", "Never" : "从不", "Saved" : "已保存", + "External mount error" : "外部挂载错误", "external-storage" : "外部存储", "Username" : "用户名", "Password" : "密码", "Save" : "保存", "Access key" : "Access key", "Secret key" : "Secret key", + "Builtin" : "内置", "None" : "无", "API key" : "API密匙", + "Username and password" : "用户名和密码", + "RSA public key" : "RSA 公钥", + "Public key" : "公钥", "Amazon S3" : "Amazon S3", + "Hostname" : "主机名", "Port" : "端口", "Region" : "地区", "Enable SSL" : "启用 SSL", @@ -37,11 +47,17 @@ "SFTP" : "SFTP", "Root" : "根路径", "SFTP with secret key login" : "包含secret key的SFTP", + "SMB / CIFS" : "SMB / CIFS", "Share" : "共享", "Domain" : "域名", "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息", "OpenStack Object Storage" : "OpenStack 对象存储", "<b>Note:</b> " : "<b>注意：</b>", + "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b> PHP 中的 cURL 支持未启用或未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b> PHP 中的 FTP 支持未启用或未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意：</b>“%s”尚未安装。对 %s 的挂载无法进行。请联系系统管理员进行安装。", + "No external storage configured" : "未配置外部存储", + "You can add external storages in the personal settings" : "您可以在个人设置中添加外部存储", "Name" : "名称", "Storage type" : "存储类型", "Scope" : "适用范围", @@ -53,6 +69,7 @@ "Add storage" : "增加存储", "Advanced settings" : "高级选项", "Delete" : "删除", + "Allow users to mount external storage" : "允许用户挂载外部存储", "Allow users to mount the following external storage" : "允许用户挂载以下外部存储" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php index 51c2debd726..d85e0f45631 100644 --- a/apps/files_external/lib/config/configadapter.php +++ b/apps/files_external/lib/config/configadapter.php @@ -23,6 +23,7 @@ namespace OCA\Files_External\Config; +use OC\Files\Storage\Wrapper\Availability; use OCA\Files_external\Migration\StorageMigrator; use OCP\Files\Storage; use OC\Files\Mount\MountPoint; @@ -34,6 +35,7 @@ use OCA\Files_external\Service\UserStoragesService; use OCA\Files_External\Service\UserGlobalStoragesService; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Lib\FailedStorage; +use OCP\Files\StorageNotAvailableException; /** * Make the old files_external config work with the new public mount config api @@ -132,8 +134,10 @@ class ConfigAdapter implements IMountProvider { try { $availability = $impl->getAvailability(); - if (!$availability['available']) { - $impl = new FailedStorage(['exception' => null]); + if (!$availability['available'] && !Availability::shouldRecheck($availability)) { + $impl = new FailedStorage([ + 'exception' => new StorageNotAvailableException('Storage with mount id ' . $storage->getId() . ' is not available') + ]); } } catch (\Exception $e) { // propagate exception into filesystem diff --git a/apps/files_external/lib/failedstorage.php b/apps/files_external/lib/failedstorage.php index 928d09e20f8..20cf43d74b2 100644 --- a/apps/files_external/lib/failedstorage.php +++ b/apps/files_external/lib/failedstorage.php @@ -39,6 +39,9 @@ class FailedStorage extends Common { */ public function __construct($params) { $this->e = $params['exception']; + if (!$this->e) { + throw new \InvalidArgumentException('Missing "exception" argument in FailedStorage constructor'); + } } public function getId() { diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 70db30c6855..90f4d2274b0 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert", "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.", + "Not allowed to create a federated share with the same user server" : "Das Erstellen einer föderierten Freigabe mit dem gleichen Benutzerserver ist nicht erlaubt", "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat", "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein", "Storage not valid" : "Speicher ungültig", @@ -38,6 +39,8 @@ OC.L10N.register( "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt", + "%2$s shared %1$s with %3$s" : "%2$s hat %1$s mit %3$s geteilt", + "You removed the share of %2$s for %1$s" : "Sie haben die Freigabe von %2$s für %1$s gelöscht", "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt", "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt", "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 6a3f9b353db..834be383d4e 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -1,6 +1,7 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert", "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.", + "Not allowed to create a federated share with the same user server" : "Das Erstellen einer föderierten Freigabe mit dem gleichen Benutzerserver ist nicht erlaubt", "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat", "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein", "Storage not valid" : "Speicher ungültig", @@ -36,6 +37,8 @@ "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt", + "%2$s shared %1$s with %3$s" : "%2$s hat %1$s mit %3$s geteilt", + "You removed the share of %2$s for %1$s" : "Sie haben die Freigabe von %2$s für %1$s gelöscht", "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt", "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt", "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt", diff --git a/apps/files_sharing/l10n/fil.js b/apps/files_sharing/l10n/fil.js new file mode 100644 index 00000000000..59f17cc001b --- /dev/null +++ b/apps/files_sharing/l10n/fil.js @@ -0,0 +1,6 @@ +OC.L10N.register( + "files_sharing", + { + "Password" : "Password" +}, +"nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fil.json b/apps/files_sharing/l10n/fil.json new file mode 100644 index 00000000000..b60f17590ba --- /dev/null +++ b/apps/files_sharing/l10n/fil.json @@ -0,0 +1,4 @@ +{ "translations": { + "Password" : "Password" +},"pluralForm" :"nplurals=2; plural=(n > 1);" +}
\ No newline at end of file diff --git a/apps/files_sharing/l10n/hy.js b/apps/files_sharing/l10n/hy.js index 28de3fecd2e..2e8a459c6da 100644 --- a/apps/files_sharing/l10n/hy.js +++ b/apps/files_sharing/l10n/hy.js @@ -4,6 +4,7 @@ OC.L10N.register( "Cancel" : "Չեղարկել", "Password" : "Գաղտնաբառ", "Name" : "Անուն", - "Download" : "Բեռնել" + "Download" : "Ներբեռնել", + "Download %s" : "Ներբեռնել %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/hy.json b/apps/files_sharing/l10n/hy.json index ca2bc14a120..a189280c922 100644 --- a/apps/files_sharing/l10n/hy.json +++ b/apps/files_sharing/l10n/hy.json @@ -2,6 +2,7 @@ "Cancel" : "Չեղարկել", "Password" : "Գաղտնաբառ", "Name" : "Անուն", - "Download" : "Բեռնել" + "Download" : "Ներբեռնել", + "Download %s" : "Ներբեռնել %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js index 99cdb6bda86..ff2a630c569 100644 --- a/apps/files_sharing/l10n/ko.js +++ b/apps/files_sharing/l10n/ko.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Server to server sharing is not enabled on this server" : "이 서버에서 서버간 공유를 사용할 수 없음", "The mountpoint name contains invalid characters." : "마운트 지점 이름에 잘못된 글자가 포함되어 있습니다.", + "Not allowed to create a federated share with the same user server" : "같은 사용자 서버 내에서 연합 공유를 만들 수 없음", "Invalid or untrusted SSL certificate" : "잘못되었거나 신뢰할 수 없는 SSL 인증서", "Could not authenticate to remote share, password might be wrong" : "원격 공유에서 인증할 수 없습니다. 암호가 맞지 않을 수 있습니다.", "Storage not valid" : "저장소가 잘못됨", @@ -10,6 +11,7 @@ OC.L10N.register( "Shared with you" : "나와 공유됨", "Shared with others" : "다른 사람과 공유됨", "Shared by link" : "링크로 공유됨", + "Federated sharing" : "연합 공유", "Nothing shared with you yet" : "나와 공유된 항목 없음", "Files and folders others share with you will show up here" : "다른 사람이 공유한 파일과 폴더가 여기에 나타납니다", "Nothing shared yet" : "공유된 항목 없음", @@ -38,20 +40,38 @@ OC.L10N.register( "Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨", "You shared %1$s with %2$s" : "내가 %2$s 님과 %1$s을(를) 공유함", "%2$s shared %1$s with %3$s" : "%2$s 님이 %1$s을(를) %3$s 님과 공유함", + "You removed the share of %2$s for %1$s" : "%1$s을(를) 위한 %2$s 그룹의 공유를 삭제함", + "%2$s removed the share of %3$s for %1$s" : "%2$s 님이 %1$s을(를) 위한 %3$s 그룹의 공유를 삭제함", "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함", "%2$s shared %1$s with group %3$s" : "%2$s 님이 %1$s을(를) %3$s 그룹과 공유함", + "You removed the share of group %2$s for %1$s" : "%1$s 님을 위한 %2$s 그룹 공유를 삭제함", + "%2$s removed the share of group %3$s for %1$s" : "%2$s 님이 %1$s에 대한 %3$s 그룹의 공유를 삭제함", "%2$s shared %1$s via link" : "%2$s 님이 %1$s을(를) 링크로 공유함", "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함", + "You removed the public link for %1$s" : "%1$s의 공개 링크를 삭제함", + "%2$s removed the public link for %1$s" : "%2$s 님이 %1$s의 공개 링크를 삭제함", + "Your public link for %1$s expired" : "%1$s의 공개 링크가 만료됨", + "The public link of %2$s for %1$s expired" : "%2$s 님의 %1$s 공개 링크가 만료됨", "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함", + "%2$s removed the share for %1$s" : "%2$s 님이 %1$s 공유를 삭제함", "Downloaded via public link" : "공개 링크로 다운로드", "Shared with %2$s" : "%2$s 님과 공유함", "Shared with %3$s by %2$s" : "%2$s 님이 %3$s 님과 공유함", + "Removed share for %2$s" : "%2$s 님의 공유를 삭제함", + "%2$s removed share for %3$s" : "%2$s 님이 %3$s 님의 공유를 삭제함", "Shared with group %2$s" : "%2$s 그룹과 공유함", "Shared with group %3$s by %2$s" : "%2$s 님이 %3$s 그룹과 공유함", + "Removed share of group %2$s" : "%2$s 그룹의 공유를 삭제함", + "%2$s removed share of group %3$s" : "%2$s 님이 그룹 %3$s의 공유를 삭제함", "Shared via link by %2$s" : "%2$s 님이 링크로 공유함", "Shared via public link" : "공개 링크로 공유함", + "Removed public link" : "공개 링크 삭제함", + "%2$s removed public link" : "%2$s 님이 공개 링크 삭제함", + "Public link expired" : "공개 링크 만료됨", + "Public link of %2$s expired" : "%2$s 님의 공개 링크 만료됨", "Shared by %2$s" : "%2$s 님이 공유함", "Shares" : "공유", + "You received \"/%2$s\" as a remote share from %1$s" : "%1$s에서 원격 공유로 \"/%2$s\"을(를) 받음", "Accept" : "수락", "Decline" : "거절", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json index ad944c69215..727265c259f 100644 --- a/apps/files_sharing/l10n/ko.json +++ b/apps/files_sharing/l10n/ko.json @@ -1,6 +1,7 @@ { "translations": { "Server to server sharing is not enabled on this server" : "이 서버에서 서버간 공유를 사용할 수 없음", "The mountpoint name contains invalid characters." : "마운트 지점 이름에 잘못된 글자가 포함되어 있습니다.", + "Not allowed to create a federated share with the same user server" : "같은 사용자 서버 내에서 연합 공유를 만들 수 없음", "Invalid or untrusted SSL certificate" : "잘못되었거나 신뢰할 수 없는 SSL 인증서", "Could not authenticate to remote share, password might be wrong" : "원격 공유에서 인증할 수 없습니다. 암호가 맞지 않을 수 있습니다.", "Storage not valid" : "저장소가 잘못됨", @@ -8,6 +9,7 @@ "Shared with you" : "나와 공유됨", "Shared with others" : "다른 사람과 공유됨", "Shared by link" : "링크로 공유됨", + "Federated sharing" : "연합 공유", "Nothing shared with you yet" : "나와 공유된 항목 없음", "Files and folders others share with you will show up here" : "다른 사람이 공유한 파일과 폴더가 여기에 나타납니다", "Nothing shared yet" : "공유된 항목 없음", @@ -36,20 +38,38 @@ "Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨", "You shared %1$s with %2$s" : "내가 %2$s 님과 %1$s을(를) 공유함", "%2$s shared %1$s with %3$s" : "%2$s 님이 %1$s을(를) %3$s 님과 공유함", + "You removed the share of %2$s for %1$s" : "%1$s을(를) 위한 %2$s 그룹의 공유를 삭제함", + "%2$s removed the share of %3$s for %1$s" : "%2$s 님이 %1$s을(를) 위한 %3$s 그룹의 공유를 삭제함", "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함", "%2$s shared %1$s with group %3$s" : "%2$s 님이 %1$s을(를) %3$s 그룹과 공유함", + "You removed the share of group %2$s for %1$s" : "%1$s 님을 위한 %2$s 그룹 공유를 삭제함", + "%2$s removed the share of group %3$s for %1$s" : "%2$s 님이 %1$s에 대한 %3$s 그룹의 공유를 삭제함", "%2$s shared %1$s via link" : "%2$s 님이 %1$s을(를) 링크로 공유함", "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함", + "You removed the public link for %1$s" : "%1$s의 공개 링크를 삭제함", + "%2$s removed the public link for %1$s" : "%2$s 님이 %1$s의 공개 링크를 삭제함", + "Your public link for %1$s expired" : "%1$s의 공개 링크가 만료됨", + "The public link of %2$s for %1$s expired" : "%2$s 님의 %1$s 공개 링크가 만료됨", "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함", + "%2$s removed the share for %1$s" : "%2$s 님이 %1$s 공유를 삭제함", "Downloaded via public link" : "공개 링크로 다운로드", "Shared with %2$s" : "%2$s 님과 공유함", "Shared with %3$s by %2$s" : "%2$s 님이 %3$s 님과 공유함", + "Removed share for %2$s" : "%2$s 님의 공유를 삭제함", + "%2$s removed share for %3$s" : "%2$s 님이 %3$s 님의 공유를 삭제함", "Shared with group %2$s" : "%2$s 그룹과 공유함", "Shared with group %3$s by %2$s" : "%2$s 님이 %3$s 그룹과 공유함", + "Removed share of group %2$s" : "%2$s 그룹의 공유를 삭제함", + "%2$s removed share of group %3$s" : "%2$s 님이 그룹 %3$s의 공유를 삭제함", "Shared via link by %2$s" : "%2$s 님이 링크로 공유함", "Shared via public link" : "공개 링크로 공유함", + "Removed public link" : "공개 링크 삭제함", + "%2$s removed public link" : "%2$s 님이 공개 링크 삭제함", + "Public link expired" : "공개 링크 만료됨", + "Public link of %2$s expired" : "%2$s 님의 공개 링크 만료됨", "Shared by %2$s" : "%2$s 님이 공유함", "Shares" : "공유", + "You received \"/%2$s\" as a remote share from %1$s" : "%1$s에서 원격 공유로 \"/%2$s\"을(를) 받음", "Accept" : "수락", "Decline" : "거절", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js index 5acdcf116fd..9ffad090397 100644 --- a/apps/files_sharing/l10n/pl.js +++ b/apps/files_sharing/l10n/pl.js @@ -47,6 +47,7 @@ OC.L10N.register( "Download" : "Pobierz", "Download %s" : "Pobierz %s", "Direct link" : "Bezpośredni link", - "Open documentation" : "Otwórz dokumentację" + "Open documentation" : "Otwórz dokumentację", + "Add to your website" : "Dodaj do swojej strony" }, "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json index ded962ac9e1..3f59d73864d 100644 --- a/apps/files_sharing/l10n/pl.json +++ b/apps/files_sharing/l10n/pl.json @@ -45,6 +45,7 @@ "Download" : "Pobierz", "Download %s" : "Pobierz %s", "Direct link" : "Bezpośredni link", - "Open documentation" : "Otwórz dokumentację" + "Open documentation" : "Otwórz dokumentację", + "Add to your website" : "Dodaj do swojej strony" },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js index a9452e14890..1c532341231 100644 --- a/apps/files_sharing/l10n/sr.js +++ b/apps/files_sharing/l10n/sr.js @@ -10,6 +10,7 @@ OC.L10N.register( "Shared with you" : "Дељено са вама", "Shared with others" : "Дељено са осталима", "Shared by link" : "Дељено путем везе", + "Federated sharing" : "Здружено дељење", "Nothing shared with you yet" : "Још увек се ништа са вама не дели", "Files and folders others share with you will show up here" : "Фајлови и фасцикле које други деле са вама појавиће се овде", "Nothing shared yet" : "Још се ништа не дели", @@ -41,6 +42,7 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s подели %1$s са вама", "Shares" : "Дељења", "Accept" : "Прихвати", + "Decline" : "Одбиј", "This share is password-protected" : "Дељење је заштићено лозинком", "The password is wrong. Try again." : "Лозинка је погрешна. Покушајте поново.", "Password" : "Лозинка", @@ -61,6 +63,8 @@ OC.L10N.register( "Open documentation" : "Отвори документацију", "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере", "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера", - "Federated Cloud" : "Здружени облак" + "Federated Cloud" : "Здружени облак", + "Your Federated Cloud ID:" : "ИД вашег здруженог облака:", + "HTML Code:" : "ХТМЛ кôд:" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json index 96d0e37bea5..7e993ae039e 100644 --- a/apps/files_sharing/l10n/sr.json +++ b/apps/files_sharing/l10n/sr.json @@ -8,6 +8,7 @@ "Shared with you" : "Дељено са вама", "Shared with others" : "Дељено са осталима", "Shared by link" : "Дељено путем везе", + "Federated sharing" : "Здружено дељење", "Nothing shared with you yet" : "Још увек се ништа са вама не дели", "Files and folders others share with you will show up here" : "Фајлови и фасцикле које други деле са вама појавиће се овде", "Nothing shared yet" : "Још се ништа не дели", @@ -39,6 +40,7 @@ "%2$s shared %1$s with you" : "%2$s подели %1$s са вама", "Shares" : "Дељења", "Accept" : "Прихвати", + "Decline" : "Одбиј", "This share is password-protected" : "Дељење је заштићено лозинком", "The password is wrong. Try again." : "Лозинка је погрешна. Покушајте поново.", "Password" : "Лозинка", @@ -59,6 +61,8 @@ "Open documentation" : "Отвори документацију", "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере", "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера", - "Federated Cloud" : "Здружени облак" + "Federated Cloud" : "Здружени облак", + "Your Federated Cloud ID:" : "ИД вашег здруженог облака:", + "HTML Code:" : "ХТМЛ кôд:" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index 4fc50f2ef18..ac36c865c11 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -2,7 +2,7 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能", - "Invalid or untrusted SSL certificate" : "不合法或是不被信任的 SSL 证书", + "Invalid or untrusted SSL certificate" : "无效或是不被信任的 SSL 证书", "Couldn't add remote share" : "无法添加远程分享", "Shared with you" : "分享给您的文件", "Shared with others" : "您分享的文件", @@ -10,6 +10,7 @@ OC.L10N.register( "Federated sharing" : "联合云共享", "Nothing shared with you yet" : "你还没有收到任何共享的文件", "Nothing shared yet" : "还没有共享过文件", + "No shared links" : "无分享链接", "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？", "Remote share" : "远程分享", "Remote share password" : "远程分享密码", @@ -22,6 +23,8 @@ OC.L10N.register( "Sharing" : "共享", "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。", "You received a new remote share from %s" : "您从%s收到了新的远程分享", + "%1$s accepted remote share %2$s" : "%1$s 接受了远程分享 %2$s", + "%1$s declined remote share %2$s" : "%1$s 拒绝了远程分享 %2$s", "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s", "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组", "You shared %1$s via link" : "您通过链接共享了 %1$s", diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index ac1852aa347..29cee2c4043 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -1,6 +1,6 @@ { "translations": { "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能", - "Invalid or untrusted SSL certificate" : "不合法或是不被信任的 SSL 证书", + "Invalid or untrusted SSL certificate" : "无效或是不被信任的 SSL 证书", "Couldn't add remote share" : "无法添加远程分享", "Shared with you" : "分享给您的文件", "Shared with others" : "您分享的文件", @@ -8,6 +8,7 @@ "Federated sharing" : "联合云共享", "Nothing shared with you yet" : "你还没有收到任何共享的文件", "Nothing shared yet" : "还没有共享过文件", + "No shared links" : "无分享链接", "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？", "Remote share" : "远程分享", "Remote share password" : "远程分享密码", @@ -20,6 +21,8 @@ "Sharing" : "共享", "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。", "You received a new remote share from %s" : "您从%s收到了新的远程分享", + "%1$s accepted remote share %2$s" : "%1$s 接受了远程分享 %2$s", + "%1$s declined remote share %2$s" : "%1$s 拒绝了远程分享 %2$s", "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s", "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组", "You shared %1$s via link" : "您通过链接共享了 %1$s", diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php index 41f7bef589b..87f5a3598fb 100644 --- a/apps/files_sharing/lib/external/storage.php +++ b/apps/files_sharing/lib/external/storage.php @@ -55,6 +55,11 @@ class Storage extends DAV implements ISharedStorage { private $token; /** + * @var \OCP\ICacheFactory + */ + private $memcacheFactory; + + /** * @var \OCP\ICertificateManager */ private $certificateManager; @@ -67,8 +72,9 @@ class Storage extends DAV implements ISharedStorage { private $manager; public function __construct($options) { + $this->memcacheFactory = \OC::$server->getMemCacheFactory(); $discoveryManager = new DiscoveryManager( - \OC::$server->getMemCacheFactory(), + $this->memcacheFactory, \OC::$server->getHTTPClientService() ); @@ -241,10 +247,21 @@ class Storage extends DAV implements ISharedStorage { } } + /** + * @param string $url + * @return bool + */ private function testRemoteUrl($url) { + $cache = $this->memcacheFactory->create('files_sharing_remote_url'); + if($result = $cache->get($url)) { + return (bool)$result; + } + $result = file_get_contents($url); $data = json_decode($result); - return (is_object($data) and !empty($data->version)); + $returnValue = (is_object($data) and !empty($data->version)); + $cache->set($url, $returnValue); + return $returnValue; } /** diff --git a/apps/files_trashbin/l10n/fil.js b/apps/files_trashbin/l10n/fil.js new file mode 100644 index 00000000000..0c880cc3be4 --- /dev/null +++ b/apps/files_trashbin/l10n/fil.js @@ -0,0 +1,6 @@ +OC.L10N.register( + "files_trashbin", + { + "Error" : "Error" +}, +"nplurals=2; plural=(n > 1);"); diff --git a/apps/files_trashbin/l10n/fil.json b/apps/files_trashbin/l10n/fil.json new file mode 100644 index 00000000000..66c3d76a730 --- /dev/null +++ b/apps/files_trashbin/l10n/fil.json @@ -0,0 +1,4 @@ +{ "translations": { + "Error" : "Error" +},"pluralForm" :"nplurals=2; plural=(n > 1);" +}
\ No newline at end of file diff --git a/apps/files_trashbin/l10n/hy.js b/apps/files_trashbin/l10n/hy.js index 39e49b47ae1..b5f14a21117 100644 --- a/apps/files_trashbin/l10n/hy.js +++ b/apps/files_trashbin/l10n/hy.js @@ -1,6 +1,7 @@ OC.L10N.register( "files_trashbin", { + "Couldn't restore %s" : "Չկարողացա վերականգնել %s", "Deleted files" : "Ջնջված ֆայլեր", "Restore" : "Վերականգնել", "Delete" : "Ջնջել", diff --git a/apps/files_trashbin/l10n/hy.json b/apps/files_trashbin/l10n/hy.json index 4bd34056b3f..4cdf8121c67 100644 --- a/apps/files_trashbin/l10n/hy.json +++ b/apps/files_trashbin/l10n/hy.json @@ -1,4 +1,5 @@ { "translations": { + "Couldn't restore %s" : "Չկարողացա վերականգնել %s", "Deleted files" : "Ջնջված ֆայլեր", "Restore" : "Վերականգնել", "Delete" : "Ջնջել", diff --git a/apps/files_trashbin/l10n/pl.js b/apps/files_trashbin/l10n/pl.js index 0c11dab91d4..78c8edea81d 100644 --- a/apps/files_trashbin/l10n/pl.js +++ b/apps/files_trashbin/l10n/pl.js @@ -8,6 +8,7 @@ OC.L10N.register( "Delete" : "Usuń", "Delete permanently" : "Trwale usuń", "Error" : "Błąd", + "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.", "restored" : "przywrócony", "No deleted files" : "Brak skasowanych plików", "You will be able to recover deleted files from here" : "Możesz przywrócić skasowane pliki stąd", diff --git a/apps/files_trashbin/l10n/pl.json b/apps/files_trashbin/l10n/pl.json index 8b56be020fb..32c385bb319 100644 --- a/apps/files_trashbin/l10n/pl.json +++ b/apps/files_trashbin/l10n/pl.json @@ -6,6 +6,7 @@ "Delete" : "Usuń", "Delete permanently" : "Trwale usuń", "Error" : "Błąd", + "This directory is unavailable, please check the logs or contact the administrator" : "Ten folder jest niedostępny, proszę sprawdzić logi lub skontaktować się z administratorem.", "restored" : "przywrócony", "No deleted files" : "Brak skasowanych plików", "You will be able to recover deleted files from here" : "Możesz przywrócić skasowane pliki stąd", diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index bcd73639d3c..46447908b90 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -204,7 +204,7 @@ class Trashbin { $ownerView = new View('/' . $owner); // file has been deleted in between - if (!$ownerView->file_exists('/files/' . $ownerPath)) { + if (is_null($ownerPath) || $ownerPath === '' || !$ownerView->file_exists('/files/' . $ownerPath)) { return true; } diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php index b4111d88e30..a213ea75238 100644 --- a/apps/files_versions/lib/storage.php +++ b/apps/files_versions/lib/storage.php @@ -191,12 +191,7 @@ class Storage { $mtime = $users_view->filemtime('files/' . $filename); $users_view->copy('files/' . $filename, 'files_versions/' . $filename . '.v' . $mtime); // call getFileInfo to enforce a file cache entry for the new version - $newFileInfo = $users_view->getFileInfo('files_versions/' . $filename . '.v' . $mtime); - - // Keep the "encrypted" value of the original file - $oldVersion = $files_view->getFileInfo($filename)->getEncryptedVersion(); - $cache = $newFileInfo->getStorage()->getCache(); - $cache->update($newFileInfo->getId(), ['encrypted' => $oldVersion, 'encryptedVersion' => $oldVersion]); + $users_view->getFileInfo('files_versions/' . $filename . '.v' . $mtime); } } @@ -331,15 +326,22 @@ class Storage { //first create a new version $version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename); - if ( !$users_view->file_exists($version)) { - + if (!$users_view->file_exists($version)) { $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename)); - $versionCreated = true; } + $fileToRestore = 'files_versions' . $filename . '.v' . $revision; + + // Restore encrypted version of the old file for the newly restored file + // This has to happen manually here since the file is manually copied below + $oldVersion = $users_view->getFileInfo($fileToRestore)->getEncryptedVersion(); + $newFileInfo = $files_view->getFileInfo($filename); + $cache = $newFileInfo->getStorage()->getCache(); + $cache->update($newFileInfo->getId(), ['encrypted' => $oldVersion, 'encryptedVersion' => $oldVersion]); + // rollback - if (self::copyFileContents($users_view, 'files_versions' . $filename . '.v' . $revision, 'files' . $filename)) { + if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) { $files_view->touch($file, $revision); Storage::scheduleExpire($uid, $file); \OC_Hook::emit('\OCP\Versions', 'rollback', array( diff --git a/apps/systemtags/l10n/fr.js b/apps/systemtags/l10n/fr.js index d7e1f3b1c05..7d5cf74ab91 100644 --- a/apps/systemtags/l10n/fr.js +++ b/apps/systemtags/l10n/fr.js @@ -2,6 +2,13 @@ OC.L10N.register( "systemtags", { "<strong>System tags</strong> for a file have been modified" : "<strong>Les étiquettes systèmes</strong> pour un fichier ont été modifiées", + "%1$s assigned system tag %3$s" : "%1$s a attribué l'étiquette système %3$s", + "%1$s unassigned system tag %3$s" : "%1$s a retiré l'étiquette système %3$s", + "%1$s created system tag %2$s" : "%1$s a créé l'étiquette système %2$s", + "%1$s deleted system tag %2$s" : "%1$s a supprimé l'étiquette système %2$s", + "%1$s updated system tag %3$s to %2$s" : "%1$s a renommé l'étiquette système %3$s en %2$s", + "%1$s assigned system tag %3$s to %2$s" : "%1$s a attribué l'étiquette système %3$s à %2$s", + "%1$s unassigned system tag %3$s from %2$s" : "%1$s a retiré l'étiquette système %3$s à %2$s", "%s (not-assignable)" : "%s (non assignable)", "%s (invisible)" : "%s (invisible)", "Tags" : "Étiquettes", diff --git a/apps/systemtags/l10n/fr.json b/apps/systemtags/l10n/fr.json index e4b5296fb20..987e8653aef 100644 --- a/apps/systemtags/l10n/fr.json +++ b/apps/systemtags/l10n/fr.json @@ -1,5 +1,12 @@ { "translations": { "<strong>System tags</strong> for a file have been modified" : "<strong>Les étiquettes systèmes</strong> pour un fichier ont été modifiées", + "%1$s assigned system tag %3$s" : "%1$s a attribué l'étiquette système %3$s", + "%1$s unassigned system tag %3$s" : "%1$s a retiré l'étiquette système %3$s", + "%1$s created system tag %2$s" : "%1$s a créé l'étiquette système %2$s", + "%1$s deleted system tag %2$s" : "%1$s a supprimé l'étiquette système %2$s", + "%1$s updated system tag %3$s to %2$s" : "%1$s a renommé l'étiquette système %3$s en %2$s", + "%1$s assigned system tag %3$s to %2$s" : "%1$s a attribué l'étiquette système %3$s à %2$s", + "%1$s unassigned system tag %3$s from %2$s" : "%1$s a retiré l'étiquette système %3$s à %2$s", "%s (not-assignable)" : "%s (non assignable)", "%s (invisible)" : "%s (invisible)", "Tags" : "Étiquettes", diff --git a/apps/systemtags/l10n/hy.js b/apps/systemtags/l10n/hy.js index 901854a96b6..57a5000ebc2 100644 --- a/apps/systemtags/l10n/hy.js +++ b/apps/systemtags/l10n/hy.js @@ -1,6 +1,7 @@ OC.L10N.register( "systemtags", { + "No files in here" : "Ֆայլեր չկան այստեղ", "Name" : "Անուն", "Size" : "Չափս", "Modified" : "Փոփոխված" diff --git a/apps/systemtags/l10n/hy.json b/apps/systemtags/l10n/hy.json index 9e937f42cf0..bb499722f50 100644 --- a/apps/systemtags/l10n/hy.json +++ b/apps/systemtags/l10n/hy.json @@ -1,4 +1,5 @@ { "translations": { + "No files in here" : "Ֆայլեր չկան այստեղ", "Name" : "Անուն", "Size" : "Չափս", "Modified" : "Փոփոխված" diff --git a/apps/systemtags/l10n/sr.js b/apps/systemtags/l10n/sr.js index fdd31cdf781..55bb5698821 100644 --- a/apps/systemtags/l10n/sr.js +++ b/apps/systemtags/l10n/sr.js @@ -1,7 +1,16 @@ OC.L10N.register( "systemtags", { + "<strong>System tags</strong> for a file have been modified" : "<strong>Системске ознаке</strong> за фајл су измењене", + "%1$s assigned system tag %3$s" : "%1$s додели системску ознаку %3$s", + "%1$s created system tag %2$s" : "%1$s направи системску ознаку %2$s", + "%1$s deleted system tag %2$s" : "%1$s обриса системску ознаку %2$s", + "%1$s updated system tag %3$s to %2$s" : "%1$s ажурира системску ознаку %3$s на %2$s", + "%1$s assigned system tag %3$s to %2$s" : "%1$s додели системску ознаку %3$s на %2$s", + "%s (not-assignable)" : "%s (недодељива)", + "%s (invisible)" : "%s (невидљива)", "Tags" : "Ознаке", + "Tagged files" : "Означени фајлови", "No files in here" : "Овде нема фајлова", "No entries found in this folder" : "Нема ничега у овој фасцикли", "Name" : "назив", diff --git a/apps/systemtags/l10n/sr.json b/apps/systemtags/l10n/sr.json index 2acc5aa4261..38aee4880f7 100644 --- a/apps/systemtags/l10n/sr.json +++ b/apps/systemtags/l10n/sr.json @@ -1,5 +1,14 @@ { "translations": { + "<strong>System tags</strong> for a file have been modified" : "<strong>Системске ознаке</strong> за фајл су измењене", + "%1$s assigned system tag %3$s" : "%1$s додели системску ознаку %3$s", + "%1$s created system tag %2$s" : "%1$s направи системску ознаку %2$s", + "%1$s deleted system tag %2$s" : "%1$s обриса системску ознаку %2$s", + "%1$s updated system tag %3$s to %2$s" : "%1$s ажурира системску ознаку %3$s на %2$s", + "%1$s assigned system tag %3$s to %2$s" : "%1$s додели системску ознаку %3$s на %2$s", + "%s (not-assignable)" : "%s (недодељива)", + "%s (invisible)" : "%s (невидљива)", "Tags" : "Ознаке", + "Tagged files" : "Означени фајлови", "No files in here" : "Овде нема фајлова", "No entries found in this folder" : "Нема ничега у овој фасцикли", "Name" : "назив", diff --git a/apps/updatenotification/appinfo/app.php b/apps/updatenotification/appinfo/app.php index 9148b6e6ef7..f257cba6974 100644 --- a/apps/updatenotification/appinfo/app.php +++ b/apps/updatenotification/appinfo/app.php @@ -31,9 +31,11 @@ if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) { $userObject = \OC::$server->getUserSession()->getUser(); if($userObject !== null) { - if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) && $updateChecker->getUpdateState() !== []) { - \OCP\Util::addScript('updatenotification', 'notification'); - OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript'); + if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID())) { + if($updateChecker->getUpdateState() !== []) { + \OCP\Util::addScript('updatenotification', 'notification'); + OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript'); + } \OC_App::registerAdmin('updatenotification', 'admin'); } } diff --git a/apps/updatenotification/appinfo/application.php b/apps/updatenotification/appinfo/application.php index ae3317c1b54..24c0a11af69 100644 --- a/apps/updatenotification/appinfo/application.php +++ b/apps/updatenotification/appinfo/application.php @@ -22,7 +22,9 @@ namespace OCA\UpdateNotification\AppInfo; use OC\AppFramework\Utility\TimeFactory; +use OC\Updater; use OCA\UpdateNotification\Controller\AdminController; +use OCA\UpdateNotification\UpdateChecker; use OCP\AppFramework\App; use OCP\AppFramework\IAppContainer; @@ -32,13 +34,21 @@ class Application extends App { $container = $this->getContainer(); $container->registerService('AdminController', function(IAppContainer $c) { + $updater = new \OC\Updater( + \OC::$server->getHTTPHelper(), + \OC::$server->getConfig(), + \OC::$server->getIntegrityCodeChecker() + ); return new AdminController( $c->query('AppName'), $c->query('Request'), $c->getServer()->getJobList(), $c->getServer()->getSecureRandom(), $c->getServer()->getConfig(), - new TimeFactory() + new TimeFactory(), + $c->getServer()->getL10N($c->query('AppName')), + new UpdateChecker($updater), + $c->getServer()->getDateTimeFormatter() ); }); } diff --git a/apps/updatenotification/appinfo/routes.php b/apps/updatenotification/appinfo/routes.php index 2cf43c89769..9021d381b1b 100644 --- a/apps/updatenotification/appinfo/routes.php +++ b/apps/updatenotification/appinfo/routes.php @@ -24,4 +24,5 @@ namespace OCA\UpdateNotification\AppInfo; $application = new Application(); $application->registerRoutes($this, ['routes' => [ ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'], + ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'], ]]); diff --git a/apps/updatenotification/controller/admincontroller.php b/apps/updatenotification/controller/admincontroller.php index 505ea01edd9..cb0c6409d7e 100644 --- a/apps/updatenotification/controller/admincontroller.php +++ b/apps/updatenotification/controller/admincontroller.php @@ -21,12 +21,15 @@ namespace OCA\UpdateNotification\Controller; +use OCA\UpdateNotification\UpdateChecker; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; use OCP\IConfig; +use OCP\IDateTimeFormatter; +use OCP\IL10N; use OCP\IRequest; use OCP\Security\ISecureRandom; @@ -39,6 +42,12 @@ class AdminController extends Controller { private $config; /** @var ITimeFactory */ private $timeFactory; + /** @var UpdateChecker */ + private $updateChecker; + /** @var IL10N */ + private $l10n; + /** @var IDateTimeFormatter */ + private $dateTimeFormatter; /** * @param string $appName @@ -47,25 +56,70 @@ class AdminController extends Controller { * @param ISecureRandom $secureRandom * @param IConfig $config * @param ITimeFactory $timeFactory + * @param IL10N $l10n + * @param UpdateChecker $updateChecker + * @param IDateTimeFormatter $dateTimeFormatter */ public function __construct($appName, IRequest $request, IJobList $jobList, ISecureRandom $secureRandom, IConfig $config, - ITimeFactory $timeFactory) { + ITimeFactory $timeFactory, + IL10N $l10n, + UpdateChecker $updateChecker, + IDateTimeFormatter $dateTimeFormatter) { parent::__construct($appName, $request); $this->jobList = $jobList; $this->secureRandom = $secureRandom; $this->config = $config; $this->timeFactory = $timeFactory; + $this->l10n = $l10n; + $this->updateChecker = $updateChecker; + $this->dateTimeFormatter = $dateTimeFormatter; } /** * @return TemplateResponse */ public function displayPanel() { - return new TemplateResponse($this->appName, 'admin', [], ''); + $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime( + $this->config->getAppValue('core', 'lastupdatedat') + ); + + $channels = [ + 'daily', + 'beta', + 'stable', + 'production', + ]; + $currentChannel = \OCP\Util::getChannel(); + + // Remove the currently used channel from the channels list + if(($key = array_search($currentChannel, $channels)) !== false) { + unset($channels[$key]); + } + + $params = [ + 'isNewVersionAvailable' => ($this->updateChecker->getUpdateState() === []) ? false : true, + 'lastChecked' => $lastUpdateCheck, + 'currentChannel' => $currentChannel, + 'channels' => $channels, + ]; + + return new TemplateResponse($this->appName, 'admin', $params, ''); + } + + /** + * @UseSession + * + * @param string $channel + * @return DataResponse + */ + public function setChannel($channel) { + \OCP\Util::setChannel($channel); + $this->config->setAppValue('core', 'lastupdatedat', 0); + return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Updated channel')]]); } /** diff --git a/apps/updatenotification/js/admin.js b/apps/updatenotification/js/admin.js index df021fe2e97..3bc5dd21527 100644 --- a/apps/updatenotification/js/admin.js +++ b/apps/updatenotification/js/admin.js @@ -15,7 +15,7 @@ */ var loginToken = ''; $(document).ready(function(){ - $('#oca_updatenotification').click(function() { + $('#oca_updatenotification_button').click(function() { // Load the new token $.ajax({ url: OC.generateUrl('/apps/updatenotification/credentials') @@ -24,7 +24,7 @@ $(document).ready(function(){ $.ajax({ url: OC.webroot+'/updater/', headers: { - 'Authorization': loginToken + 'X-Updater-Auth': loginToken }, method: 'POST', success: function(data){ @@ -39,4 +39,16 @@ $(document).ready(function(){ }); }); }); + $('#release-channel').change(function() { + var newChannel = $('#release-channel').find(":selected").val(); + $.post( + OC.generateUrl('/apps/updatenotification/channel'), + { + 'channel': newChannel + }, + function(data){ + OC.msg.finishedAction('#channel_save_msg', data); + } + ); + }); }); diff --git a/apps/updatenotification/l10n/az.js b/apps/updatenotification/l10n/az.js index 73782cba3e7..4e2a947c404 100644 --- a/apps/updatenotification/l10n/az.js +++ b/apps/updatenotification/l10n/az.js @@ -1,6 +1,7 @@ OC.L10N.register( "updatenotification", { - "Updater" : "Yeniləyici" + "Updater" : "Yeniləyici", + "A new version is available: %s" : "Yeni versiya mövcuddur: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/az.json b/apps/updatenotification/l10n/az.json index 7be87969a43..81ad8b46130 100644 --- a/apps/updatenotification/l10n/az.json +++ b/apps/updatenotification/l10n/az.json @@ -1,4 +1,5 @@ { "translations": { - "Updater" : "Yeniləyici" + "Updater" : "Yeniləyici", + "A new version is available: %s" : "Yeni versiya mövcuddur: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/bg_BG.js b/apps/updatenotification/l10n/bg_BG.js index 443843734e1..585d75d9e57 100644 --- a/apps/updatenotification/l10n/bg_BG.js +++ b/apps/updatenotification/l10n/bg_BG.js @@ -1,6 +1,7 @@ OC.L10N.register( "updatenotification", { - "Updater" : "Обновяване" + "Updater" : "Обновяване", + "A new version is available: %s" : "Има Нова Версия: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/bg_BG.json b/apps/updatenotification/l10n/bg_BG.json index 3dc540f8e6f..465f8e978ec 100644 --- a/apps/updatenotification/l10n/bg_BG.json +++ b/apps/updatenotification/l10n/bg_BG.json @@ -1,4 +1,5 @@ { "translations": { - "Updater" : "Обновяване" + "Updater" : "Обновяване", + "A new version is available: %s" : "Има Нова Версия: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/bs.js b/apps/updatenotification/l10n/bs.js index 34e6f1d1ac4..63d9986a300 100644 --- a/apps/updatenotification/l10n/bs.js +++ b/apps/updatenotification/l10n/bs.js @@ -1,6 +1,7 @@ OC.L10N.register( "updatenotification", { - "Updater" : "Unapređivač" + "Updater" : "Unapređivač", + "A new version is available: %s" : "Dostupna je nova verzija: %s" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/updatenotification/l10n/bs.json b/apps/updatenotification/l10n/bs.json index da0308f62b9..6bf82bb0714 100644 --- a/apps/updatenotification/l10n/bs.json +++ b/apps/updatenotification/l10n/bs.json @@ -1,4 +1,5 @@ { "translations": { - "Updater" : "Unapređivač" + "Updater" : "Unapređivač", + "A new version is available: %s" : "Dostupna je nova verzija: %s" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/cs_CZ.js b/apps/updatenotification/l10n/cs_CZ.js index b7e261412ff..82364d60e69 100644 --- a/apps/updatenotification/l10n/cs_CZ.js +++ b/apps/updatenotification/l10n/cs_CZ.js @@ -1,9 +1,14 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "Aktualizovat kanál", "{version} is available. Get more information on how to update." : "Je dostupná {version}. Přečtěte si více informací jak aktualizovat.", "Updater" : "Automatické aktualizace", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Z bezpečnostních důvodů používá zabudovaný program aktualizací ownCloud dodatečné přihlašovací údaje. Pro otevření stránky s aktualizacemi klikněte na následující tlačtko.", - "Open updater" : "Otevřít program aktualizací" + "A new version is available: %s" : "Je dostupná nová verze: %s", + "Open updater" : "Otevřít program aktualizací", + "Your version is up to date." : "Používáte nejnovější verzi.", + "Checked on %s" : "Zkontrolováno %s", + "Update channel:" : "Aktualizovat kanál:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Vždy můžete aktualizovat na novější verzi / experimentální kanál. Poté ale nelze nikdy provést downgrade zpět na nižší stabilní kanál." }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/updatenotification/l10n/cs_CZ.json b/apps/updatenotification/l10n/cs_CZ.json index c022edc635d..5621045e4e2 100644 --- a/apps/updatenotification/l10n/cs_CZ.json +++ b/apps/updatenotification/l10n/cs_CZ.json @@ -1,7 +1,12 @@ { "translations": { + "Updated channel" : "Aktualizovat kanál", "{version} is available. Get more information on how to update." : "Je dostupná {version}. Přečtěte si více informací jak aktualizovat.", "Updater" : "Automatické aktualizace", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Z bezpečnostních důvodů používá zabudovaný program aktualizací ownCloud dodatečné přihlašovací údaje. Pro otevření stránky s aktualizacemi klikněte na následující tlačtko.", - "Open updater" : "Otevřít program aktualizací" + "A new version is available: %s" : "Je dostupná nová verze: %s", + "Open updater" : "Otevřít program aktualizací", + "Your version is up to date." : "Používáte nejnovější verzi.", + "Checked on %s" : "Zkontrolováno %s", + "Update channel:" : "Aktualizovat kanál:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Vždy můžete aktualizovat na novější verzi / experimentální kanál. Poté ale nelze nikdy provést downgrade zpět na nižší stabilní kanál." },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/da.js b/apps/updatenotification/l10n/da.js index 5fb9ff0e75f..4954c5c4581 100644 --- a/apps/updatenotification/l10n/da.js +++ b/apps/updatenotification/l10n/da.js @@ -2,6 +2,8 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version} er tilgængelig. Få mere information om hvordan du opdaterer.", - "Updater" : "Updater" + "Updater" : "Updater", + "A new version is available: %s" : "Der er en ny version tligængelig: %s", + "Update channel:" : "Opdatér kanal:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/da.json b/apps/updatenotification/l10n/da.json index 93ec0654478..0d59d404f55 100644 --- a/apps/updatenotification/l10n/da.json +++ b/apps/updatenotification/l10n/da.json @@ -1,5 +1,7 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} er tilgængelig. Få mere information om hvordan du opdaterer.", - "Updater" : "Updater" + "Updater" : "Updater", + "A new version is available: %s" : "Der er en ny version tligængelig: %s", + "Update channel:" : "Opdatér kanal:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/de.js b/apps/updatenotification/l10n/de.js index e9299ed07e1..8b069192b34 100644 --- a/apps/updatenotification/l10n/de.js +++ b/apps/updatenotification/l10n/de.js @@ -3,7 +3,10 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", "Updater" : "Updater", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Aus Sicherheitsgründen nutzt der ownCloud Updater zusätzlichen Anmeldeinformationen. Um die Update-Seite aufzurufen, klicke bitte auf den folgenden Button.", - "Open updater" : "Updater aufrufen" + "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", + "Open updater" : "Updater aufrufen", + "Your version is up to date." : "Deine Version ist aktuell.", + "Update channel:" : "Update-Kanal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kannst immer auf eine neuere Version updaten / experimentelle Version, aber kein Downgrade auf eine stabiliere Version durchführen." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/de.json b/apps/updatenotification/l10n/de.json index 10276b6608c..d9035a07a57 100644 --- a/apps/updatenotification/l10n/de.json +++ b/apps/updatenotification/l10n/de.json @@ -1,7 +1,10 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", "Updater" : "Updater", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Aus Sicherheitsgründen nutzt der ownCloud Updater zusätzlichen Anmeldeinformationen. Um die Update-Seite aufzurufen, klicke bitte auf den folgenden Button.", - "Open updater" : "Updater aufrufen" + "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", + "Open updater" : "Updater aufrufen", + "Your version is up to date." : "Deine Version ist aktuell.", + "Update channel:" : "Update-Kanal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kannst immer auf eine neuere Version updaten / experimentelle Version, aber kein Downgrade auf eine stabiliere Version durchführen." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/de_DE.js b/apps/updatenotification/l10n/de_DE.js index d41bc16eeab..4ab4e34f140 100644 --- a/apps/updatenotification/l10n/de_DE.js +++ b/apps/updatenotification/l10n/de_DE.js @@ -3,7 +3,8 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", "Updater" : "Updater", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Aus Sicherheitsgründen nutzt der ownCloud Updater zusätzlichen Anmeldeinformationen. Um die Update-Seite aufzurufen, klicken Sie bitte auf den folgenden Button.", - "Open updater" : "Updater aufrufen" + "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", + "Open updater" : "Updater aufrufen", + "Update channel:" : "Update-Kanal:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/de_DE.json b/apps/updatenotification/l10n/de_DE.json index d406ef9b9ea..0b20ec750aa 100644 --- a/apps/updatenotification/l10n/de_DE.json +++ b/apps/updatenotification/l10n/de_DE.json @@ -1,7 +1,8 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", "Updater" : "Updater", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Aus Sicherheitsgründen nutzt der ownCloud Updater zusätzlichen Anmeldeinformationen. Um die Update-Seite aufzurufen, klicken Sie bitte auf den folgenden Button.", - "Open updater" : "Updater aufrufen" + "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", + "Open updater" : "Updater aufrufen", + "Update channel:" : "Update-Kanal:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/el.js b/apps/updatenotification/l10n/el.js index 51aa52a5340..d5ecbce6954 100644 --- a/apps/updatenotification/l10n/el.js +++ b/apps/updatenotification/l10n/el.js @@ -3,7 +3,9 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.", "Updater" : "Εφαρμογή Ενημέρωσης", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Για λόγους ασφαλείας, το ενσωματωμένη εφαρμογή ενημέρωσης του ownCloud χρησιμοποιεί επιπλέον διαπιστευτήρια. Για να επισκεφθείτε την σελίδα της εφαρμογής ενημέρωσης κάντε κλικ στο παρακάτω κουμπί.", - "Open updater" : "Άνοιγμα εφαρμογής ενημέρωσης" + "A new version is available: %s" : "Μία νέα έκδοση είναι διαθέσιμη: %s", + "Open updater" : "Άνοιγμα εφαρμογής ενημέρωσης", + "Update channel:" : "Ενημέρωση καναλιού:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Μπορείτε πάντα να περάσετε σε νεότερη / πειραματική έκδοση. Αλλά ποτέ δεν μπορείτε να γυρίσετε πίσω σε πιο σταθερό κανάλι." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/el.json b/apps/updatenotification/l10n/el.json index d598afaca3a..de19b712dd5 100644 --- a/apps/updatenotification/l10n/el.json +++ b/apps/updatenotification/l10n/el.json @@ -1,7 +1,9 @@ { "translations": { "{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.", "Updater" : "Εφαρμογή Ενημέρωσης", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Για λόγους ασφαλείας, το ενσωματωμένη εφαρμογή ενημέρωσης του ownCloud χρησιμοποιεί επιπλέον διαπιστευτήρια. Για να επισκεφθείτε την σελίδα της εφαρμογής ενημέρωσης κάντε κλικ στο παρακάτω κουμπί.", - "Open updater" : "Άνοιγμα εφαρμογής ενημέρωσης" + "A new version is available: %s" : "Μία νέα έκδοση είναι διαθέσιμη: %s", + "Open updater" : "Άνοιγμα εφαρμογής ενημέρωσης", + "Update channel:" : "Ενημέρωση καναλιού:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Μπορείτε πάντα να περάσετε σε νεότερη / πειραματική έκδοση. Αλλά ποτέ δεν μπορείτε να γυρίσετε πίσω σε πιο σταθερό κανάλι." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/en_GB.js b/apps/updatenotification/l10n/en_GB.js index a6f83cb048a..34e8956692c 100644 --- a/apps/updatenotification/l10n/en_GB.js +++ b/apps/updatenotification/l10n/en_GB.js @@ -1,9 +1,14 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "Updated channel", "{version} is available. Get more information on how to update." : "{version} is available. Get more information on how to update.", "Updater" : "Updater", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button.", - "Open updater" : "Open updater" + "A new version is available: %s" : "A new version is available: %s", + "Open updater" : "Open updater", + "Your version is up to date." : "Your version is up to date.", + "Checked on %s" : "Checked on %s", + "Update channel:" : "Update channel:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/en_GB.json b/apps/updatenotification/l10n/en_GB.json index 0ac5846f9e8..03fbd8f7f84 100644 --- a/apps/updatenotification/l10n/en_GB.json +++ b/apps/updatenotification/l10n/en_GB.json @@ -1,7 +1,12 @@ { "translations": { + "Updated channel" : "Updated channel", "{version} is available. Get more information on how to update." : "{version} is available. Get more information on how to update.", "Updater" : "Updater", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button.", - "Open updater" : "Open updater" + "A new version is available: %s" : "A new version is available: %s", + "Open updater" : "Open updater", + "Your version is up to date." : "Your version is up to date.", + "Checked on %s" : "Checked on %s", + "Update channel:" : "Update channel:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/es.js b/apps/updatenotification/l10n/es.js index f8a88186f34..3e4f1c7202e 100644 --- a/apps/updatenotification/l10n/es.js +++ b/apps/updatenotification/l10n/es.js @@ -3,7 +3,9 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} está disponible. Obtenga más información sobre cómo actualizar.", "Updater" : "Actualizador", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Por razones de seguridad el actualizador incluido en ownCloud está utilizando credenciales adicionales. Para visitar la pagina del actualizador, por favor presione el siguiente botón.", - "Open updater" : "Abrir el actualizador" + "A new version is available: %s" : "Hay una nueva versión disponible: %s", + "Open updater" : "Abrir el actualizador", + "Update channel:" : "Canal de actualización: ", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás regresar a un canal más estable." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/es.json b/apps/updatenotification/l10n/es.json index 032ee8e85ea..679a915d863 100644 --- a/apps/updatenotification/l10n/es.json +++ b/apps/updatenotification/l10n/es.json @@ -1,7 +1,9 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} está disponible. Obtenga más información sobre cómo actualizar.", "Updater" : "Actualizador", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Por razones de seguridad el actualizador incluido en ownCloud está utilizando credenciales adicionales. Para visitar la pagina del actualizador, por favor presione el siguiente botón.", - "Open updater" : "Abrir el actualizador" + "A new version is available: %s" : "Hay una nueva versión disponible: %s", + "Open updater" : "Abrir el actualizador", + "Update channel:" : "Canal de actualización: ", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Siempre podrás actualizar a la versión más reciente o al canal experimental, pero nunca podrás regresar a un canal más estable." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/es_AR.js b/apps/updatenotification/l10n/es_AR.js index 6546f696b2f..1adeb21635a 100644 --- a/apps/updatenotification/l10n/es_AR.js +++ b/apps/updatenotification/l10n/es_AR.js @@ -1,6 +1,7 @@ OC.L10N.register( "updatenotification", { - "Updater" : "Actualizador" + "Updater" : "Actualizador", + "A new version is available: %s" : "Una nueva versión esta disponible: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/es_AR.json b/apps/updatenotification/l10n/es_AR.json index 828c965caaf..f3a64c95945 100644 --- a/apps/updatenotification/l10n/es_AR.json +++ b/apps/updatenotification/l10n/es_AR.json @@ -1,4 +1,5 @@ { "translations": { - "Updater" : "Actualizador" + "Updater" : "Actualizador", + "A new version is available: %s" : "Una nueva versión esta disponible: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/et_EE.js b/apps/updatenotification/l10n/et_EE.js index eaa6d0fc691..e0ff9695157 100644 --- a/apps/updatenotification/l10n/et_EE.js +++ b/apps/updatenotification/l10n/et_EE.js @@ -3,6 +3,8 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} on saadaval. Vaata lisainfot uuendamise kohta.", "Updater" : "Uuendaja", - "Open updater" : "Ava uuendaja" + "A new version is available: %s" : "Saadaval on uus versioon: %s", + "Open updater" : "Ava uuendaja", + "Update channel:" : "Uuenduste kanal:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/et_EE.json b/apps/updatenotification/l10n/et_EE.json index f01d796b7e4..6a7a80ab08e 100644 --- a/apps/updatenotification/l10n/et_EE.json +++ b/apps/updatenotification/l10n/et_EE.json @@ -1,6 +1,8 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} on saadaval. Vaata lisainfot uuendamise kohta.", "Updater" : "Uuendaja", - "Open updater" : "Ava uuendaja" + "A new version is available: %s" : "Saadaval on uus versioon: %s", + "Open updater" : "Ava uuendaja", + "Update channel:" : "Uuenduste kanal:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/eu.js b/apps/updatenotification/l10n/eu.js index 9677dc787dd..e4aecade110 100644 --- a/apps/updatenotification/l10n/eu.js +++ b/apps/updatenotification/l10n/eu.js @@ -1,6 +1,9 @@ OC.L10N.register( "updatenotification", { - "Updater" : "Eguneratzailea" + "Updater" : "Eguneratzailea", + "A new version is available: %s" : "Bertsio berri bat eskuragarri dago: %s", + "Update channel:" : "Eguneraketa kanala:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Bertsio berri / kanal experimetnal batera eguneratzea beti da posible. Baina inoiz ez da posible egonkorragoa den bertsio zaharragoko kanal batera itzultzea." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/eu.json b/apps/updatenotification/l10n/eu.json index 663af5e4096..b842dd141ff 100644 --- a/apps/updatenotification/l10n/eu.json +++ b/apps/updatenotification/l10n/eu.json @@ -1,4 +1,7 @@ { "translations": { - "Updater" : "Eguneratzailea" + "Updater" : "Eguneratzailea", + "A new version is available: %s" : "Bertsio berri bat eskuragarri dago: %s", + "Update channel:" : "Eguneraketa kanala:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Bertsio berri / kanal experimetnal batera eguneratzea beti da posible. Baina inoiz ez da posible egonkorragoa den bertsio zaharragoko kanal batera itzultzea." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/fi_FI.js b/apps/updatenotification/l10n/fi_FI.js index 165bc57936a..811f4cf83e8 100644 --- a/apps/updatenotification/l10n/fi_FI.js +++ b/apps/updatenotification/l10n/fi_FI.js @@ -1,9 +1,14 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "Päivitetty kanava", "{version} is available. Get more information on how to update." : "{version} on saatavilla. Tarjolla on lisätietoja päivittämisestä.", "Updater" : "Päivitysohjelma", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Tietoturvasyistä ownCloudin sisäänrakennettu päivitysohjelma käyttää erillisiä tunnistamistietoja. Siirry päivitysohjelman sivulle napsauttamalla seuraavaa painiketta.", - "Open updater" : "Avaa päivitysohjelma" + "A new version is available: %s" : "Uusi versio on saatavilla: %s", + "Open updater" : "Avaa päivitysohjelma", + "Your version is up to date." : "Versiosi on ajan tasalla.", + "Checked on %s" : "Tarkistettu %s", + "Update channel:" : "Päivityskanava:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Voit aina päivittää uudempaan versioon tai kokeellisen jakelukanavan versioon. Et voi kuitenkaan palata aiempaan, vakaan julkaisukanavan versioon." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/fi_FI.json b/apps/updatenotification/l10n/fi_FI.json index 5a96aadb044..0a475e17ba7 100644 --- a/apps/updatenotification/l10n/fi_FI.json +++ b/apps/updatenotification/l10n/fi_FI.json @@ -1,7 +1,12 @@ { "translations": { + "Updated channel" : "Päivitetty kanava", "{version} is available. Get more information on how to update." : "{version} on saatavilla. Tarjolla on lisätietoja päivittämisestä.", "Updater" : "Päivitysohjelma", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Tietoturvasyistä ownCloudin sisäänrakennettu päivitysohjelma käyttää erillisiä tunnistamistietoja. Siirry päivitysohjelman sivulle napsauttamalla seuraavaa painiketta.", - "Open updater" : "Avaa päivitysohjelma" + "A new version is available: %s" : "Uusi versio on saatavilla: %s", + "Open updater" : "Avaa päivitysohjelma", + "Your version is up to date." : "Versiosi on ajan tasalla.", + "Checked on %s" : "Tarkistettu %s", + "Update channel:" : "Päivityskanava:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Voit aina päivittää uudempaan versioon tai kokeellisen jakelukanavan versioon. Et voi kuitenkaan palata aiempaan, vakaan julkaisukanavan versioon." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/fr.js b/apps/updatenotification/l10n/fr.js index b41a6de202e..b4bcd3bf242 100644 --- a/apps/updatenotification/l10n/fr.js +++ b/apps/updatenotification/l10n/fr.js @@ -3,7 +3,11 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations sur comment mettre à jour.", "Updater" : "Mises à jour", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Pour des raisons de sécurité, le module de mises à jour intégré à ownCloud utilise des informations d'identification supplémentaires. Pour visiter la page du module de mises à jour, cliquez sur le bouton suivant.", - "Open updater" : "Ouvrir le système de mise à jour" + "A new version is available: %s" : "Une nouvelle version est disponible : %s", + "Open updater" : "Ouvrir le système de mise à jour", + "Your version is up to date." : "Votre version est à jour.", + "Checked on %s" : "Vérifié le %s", + "Update channel:" : "Canal de mise à jour :", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Vous pouvez à tout moment mettre à jour vers une version plus récente ou un canal expérimental. Cependant vous ne pourrez jamais revenir à un canal plus stable." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/updatenotification/l10n/fr.json b/apps/updatenotification/l10n/fr.json index 473d53d11ff..d48167344b7 100644 --- a/apps/updatenotification/l10n/fr.json +++ b/apps/updatenotification/l10n/fr.json @@ -1,7 +1,11 @@ { "translations": { "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations sur comment mettre à jour.", "Updater" : "Mises à jour", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Pour des raisons de sécurité, le module de mises à jour intégré à ownCloud utilise des informations d'identification supplémentaires. Pour visiter la page du module de mises à jour, cliquez sur le bouton suivant.", - "Open updater" : "Ouvrir le système de mise à jour" + "A new version is available: %s" : "Une nouvelle version est disponible : %s", + "Open updater" : "Ouvrir le système de mise à jour", + "Your version is up to date." : "Votre version est à jour.", + "Checked on %s" : "Vérifié le %s", + "Update channel:" : "Canal de mise à jour :", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Vous pouvez à tout moment mettre à jour vers une version plus récente ou un canal expérimental. Cependant vous ne pourrez jamais revenir à un canal plus stable." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/gl.js b/apps/updatenotification/l10n/gl.js index f87d3768aab..c856220e3bb 100644 --- a/apps/updatenotification/l10n/gl.js +++ b/apps/updatenotification/l10n/gl.js @@ -2,6 +2,8 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version} está dispoñíbel. Obteña máis información sobre como actualizar.", - "Updater" : "Actualizador" + "Updater" : "Actualizador", + "A new version is available: %s" : "Hai dispoñíbel unha versión: %s", + "Update channel:" : "Canle de actualización:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/gl.json b/apps/updatenotification/l10n/gl.json index dba6de2dc17..1c11b05aa64 100644 --- a/apps/updatenotification/l10n/gl.json +++ b/apps/updatenotification/l10n/gl.json @@ -1,5 +1,7 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} está dispoñíbel. Obteña máis información sobre como actualizar.", - "Updater" : "Actualizador" + "Updater" : "Actualizador", + "A new version is available: %s" : "Hai dispoñíbel unha versión: %s", + "Update channel:" : "Canle de actualización:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/he.js b/apps/updatenotification/l10n/he.js index 04681096101..17d99402ff3 100644 --- a/apps/updatenotification/l10n/he.js +++ b/apps/updatenotification/l10n/he.js @@ -1,9 +1,14 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "ערוץ מעודכן", "{version} is available. Get more information on how to update." : "{version} זמינה. ניתן לקבל מידע נוסף על איך לעדכן.", "Updater" : "מעדכן", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "מסיבות הבטחה מעדכן ה- ownCloud המובנה משתמש באימות נוסף. לביקור בעמוד העדכון יש ללחוץ על הכפתור הבא.", - "Open updater" : "פתיחת מעדכן" + "A new version is available: %s" : "קיימת גרסה מעודכנת: %s", + "Open updater" : "פתיחת מעדכן", + "Your version is up to date." : "הגרסה שבידך מעודכנת.", + "Checked on %s" : "נבדק לאחרונה ב- %s", + "Update channel:" : "עדכון ערוץ:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "תמיד ניתן לעדכן לגרסה חדשה / ערוץ ניסיון. אבל לא ניתן להוריד גרסה לערוץ יציב יותר." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/he.json b/apps/updatenotification/l10n/he.json index 8bdf252e4f3..1b69499318c 100644 --- a/apps/updatenotification/l10n/he.json +++ b/apps/updatenotification/l10n/he.json @@ -1,7 +1,12 @@ { "translations": { + "Updated channel" : "ערוץ מעודכן", "{version} is available. Get more information on how to update." : "{version} זמינה. ניתן לקבל מידע נוסף על איך לעדכן.", "Updater" : "מעדכן", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "מסיבות הבטחה מעדכן ה- ownCloud המובנה משתמש באימות נוסף. לביקור בעמוד העדכון יש ללחוץ על הכפתור הבא.", - "Open updater" : "פתיחת מעדכן" + "A new version is available: %s" : "קיימת גרסה מעודכנת: %s", + "Open updater" : "פתיחת מעדכן", + "Your version is up to date." : "הגרסה שבידך מעודכנת.", + "Checked on %s" : "נבדק לאחרונה ב- %s", + "Update channel:" : "עדכון ערוץ:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "תמיד ניתן לעדכן לגרסה חדשה / ערוץ ניסיון. אבל לא ניתן להוריד גרסה לערוץ יציב יותר." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/hr.js b/apps/updatenotification/l10n/hr.js index 7a3d340816d..e089797d824 100644 --- a/apps/updatenotification/l10n/hr.js +++ b/apps/updatenotification/l10n/hr.js @@ -1,6 +1,7 @@ OC.L10N.register( "updatenotification", { - "Updater" : "Aplikcija za nadogradnju" + "Updater" : "Aplikcija za nadogradnju", + "A new version is available: %s" : "Nova verzija je dostupna: %s" }, "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"); diff --git a/apps/updatenotification/l10n/hr.json b/apps/updatenotification/l10n/hr.json index 16dc7becd6a..f45cdb0e897 100644 --- a/apps/updatenotification/l10n/hr.json +++ b/apps/updatenotification/l10n/hr.json @@ -1,4 +1,5 @@ { "translations": { - "Updater" : "Aplikcija za nadogradnju" + "Updater" : "Aplikcija za nadogradnju", + "A new version is available: %s" : "Nova verzija je dostupna: %s" },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/hu_HU.js b/apps/updatenotification/l10n/hu_HU.js index 7d26aaf26dd..d48806ef2a9 100644 --- a/apps/updatenotification/l10n/hu_HU.js +++ b/apps/updatenotification/l10n/hu_HU.js @@ -2,6 +2,8 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version} rendelkezésre áll. További információ a frissítéshez.", - "Updater" : "Frissítéskezelő" + "Updater" : "Frissítéskezelő", + "Update channel:" : "Frissítési csatorna:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Mindig frissíthetsz a újabb verzióra vagy kísérleti csatornára, de visszafelé sosem frissíthetsz egy jóval stabilabb verzióra." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/hu_HU.json b/apps/updatenotification/l10n/hu_HU.json index d7a611238c9..ec51cfdf532 100644 --- a/apps/updatenotification/l10n/hu_HU.json +++ b/apps/updatenotification/l10n/hu_HU.json @@ -1,5 +1,7 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} rendelkezésre áll. További információ a frissítéshez.", - "Updater" : "Frissítéskezelő" + "Updater" : "Frissítéskezelő", + "Update channel:" : "Frissítési csatorna:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Mindig frissíthetsz a újabb verzióra vagy kísérleti csatornára, de visszafelé sosem frissíthetsz egy jóval stabilabb verzióra." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/id.js b/apps/updatenotification/l10n/id.js index 7d90d3848f0..f328e4641e6 100644 --- a/apps/updatenotification/l10n/id.js +++ b/apps/updatenotification/l10n/id.js @@ -2,6 +2,9 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version} tersedia. Dapatkan informasi lebih lanjut cara memperbaruinya.", - "Updater" : "Pengupdate" + "Updater" : "Pengupdate", + "A new version is available: %s" : "Versi baru tersedia: %s", + "Update channel:" : "Saluran update:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Anda dapat memperbarui ke versi yang lebih baru / saluran percobaan. Namun Anda tidak dapat menurunkan ke saluran stabil." }, "nplurals=1; plural=0;"); diff --git a/apps/updatenotification/l10n/id.json b/apps/updatenotification/l10n/id.json index 86dccdda80a..c3ba9eb7a3f 100644 --- a/apps/updatenotification/l10n/id.json +++ b/apps/updatenotification/l10n/id.json @@ -1,5 +1,8 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} tersedia. Dapatkan informasi lebih lanjut cara memperbaruinya.", - "Updater" : "Pengupdate" + "Updater" : "Pengupdate", + "A new version is available: %s" : "Versi baru tersedia: %s", + "Update channel:" : "Saluran update:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Anda dapat memperbarui ke versi yang lebih baru / saluran percobaan. Namun Anda tidak dapat menurunkan ke saluran stabil." },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/is.js b/apps/updatenotification/l10n/is.js index 6d2cf902382..3f3f12b215d 100644 --- a/apps/updatenotification/l10n/is.js +++ b/apps/updatenotification/l10n/is.js @@ -3,7 +3,6 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} er í boði. Fá frekari upplýsingar um hvernig á að uppfæra.", "Updater" : "Uppfærslustýring", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Af öryggisástæðum notar innbyggða uppfærslustýringin í ownCloud viðbótar-auðkennisupplýsingar. Til að skoða síðu uppfærslustýringarinnar skaltu smella á eftirfarandi hnapp.", "Open updater" : "Opna uppfærslustýringu" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/updatenotification/l10n/is.json b/apps/updatenotification/l10n/is.json index dbf667e64af..5cf085b66ed 100644 --- a/apps/updatenotification/l10n/is.json +++ b/apps/updatenotification/l10n/is.json @@ -1,7 +1,6 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} er í boði. Fá frekari upplýsingar um hvernig á að uppfæra.", "Updater" : "Uppfærslustýring", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Af öryggisástæðum notar innbyggða uppfærslustýringin í ownCloud viðbótar-auðkennisupplýsingar. Til að skoða síðu uppfærslustýringarinnar skaltu smella á eftirfarandi hnapp.", "Open updater" : "Opna uppfærslustýringu" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/it.js b/apps/updatenotification/l10n/it.js index 6c8ab0d33e4..7fb3d153b9a 100644 --- a/apps/updatenotification/l10n/it.js +++ b/apps/updatenotification/l10n/it.js @@ -1,9 +1,14 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "Canale di aggiornamento", "{version} is available. Get more information on how to update." : "{version} è disponibile. Ottieni ulteriori informazioni su come eseguire l'aggiornamento.", "Updater" : "Strumento di aggiornamento", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Per ragioni di sicurezza, lo strumento di aggiornamento integrato di ownCloud utilizza credenziali aggiuntive. Per visitare la pagine dello strumento di aggiornamento, fai clic sul pulsante seguente.", - "Open updater" : "Apri lo strumento di aggiornamento" + "A new version is available: %s" : "Una nuova versione è disponibile: %s", + "Open updater" : "Apri lo strumento di aggiornamento", + "Your version is up to date." : "La tua versione è aggiornata.", + "Checked on %s" : "Controllato il %s", + "Update channel:" : "Canale di aggiornamento:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Puoi aggiornare sempre a una nuova versione / canale sperimentale. Ma non puoi mai tornare a una versione precedente." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/it.json b/apps/updatenotification/l10n/it.json index 31b6d2b8989..18c4b7e0d1d 100644 --- a/apps/updatenotification/l10n/it.json +++ b/apps/updatenotification/l10n/it.json @@ -1,7 +1,12 @@ { "translations": { + "Updated channel" : "Canale di aggiornamento", "{version} is available. Get more information on how to update." : "{version} è disponibile. Ottieni ulteriori informazioni su come eseguire l'aggiornamento.", "Updater" : "Strumento di aggiornamento", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Per ragioni di sicurezza, lo strumento di aggiornamento integrato di ownCloud utilizza credenziali aggiuntive. Per visitare la pagine dello strumento di aggiornamento, fai clic sul pulsante seguente.", - "Open updater" : "Apri lo strumento di aggiornamento" + "A new version is available: %s" : "Una nuova versione è disponibile: %s", + "Open updater" : "Apri lo strumento di aggiornamento", + "Your version is up to date." : "La tua versione è aggiornata.", + "Checked on %s" : "Controllato il %s", + "Update channel:" : "Canale di aggiornamento:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Puoi aggiornare sempre a una nuova versione / canale sperimentale. Ma non puoi mai tornare a una versione precedente." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/ja.js b/apps/updatenotification/l10n/ja.js index f3b271e9e49..b0b9e40813b 100644 --- a/apps/updatenotification/l10n/ja.js +++ b/apps/updatenotification/l10n/ja.js @@ -3,7 +3,9 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} が利用可能です。アップデート方法について詳細情報を確認してください。", "Updater" : "アップデート", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "セキュリティ上の理由から、ownCloudに組み込まれているアップデーターは追加で認証情報を利用します。アップデーターページを開くには、以下のボタンをクリックしてください。", - "Open updater" : "アップデーターを開く" + "A new version is available: %s" : "新しいバージョンが利用可能: %s", + "Open updater" : "アップデーターを開く", + "Update channel:" : "アップデートチャンネル:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "開発版の新しいバージョンにアップデートできます。ただし、アップデート後は安定版にダウングレードできません。" }, "nplurals=1; plural=0;"); diff --git a/apps/updatenotification/l10n/ja.json b/apps/updatenotification/l10n/ja.json index ffdb3804276..d422159a267 100644 --- a/apps/updatenotification/l10n/ja.json +++ b/apps/updatenotification/l10n/ja.json @@ -1,7 +1,9 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} が利用可能です。アップデート方法について詳細情報を確認してください。", "Updater" : "アップデート", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "セキュリティ上の理由から、ownCloudに組み込まれているアップデーターは追加で認証情報を利用します。アップデーターページを開くには、以下のボタンをクリックしてください。", - "Open updater" : "アップデーターを開く" + "A new version is available: %s" : "新しいバージョンが利用可能: %s", + "Open updater" : "アップデーターを開く", + "Update channel:" : "アップデートチャンネル:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "開発版の新しいバージョンにアップデートできます。ただし、アップデート後は安定版にダウングレードできません。" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/ko.js b/apps/updatenotification/l10n/ko.js index 8e1d12173f3..0d150a8a64c 100644 --- a/apps/updatenotification/l10n/ko.js +++ b/apps/updatenotification/l10n/ko.js @@ -2,6 +2,10 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version}을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 알아보십시오.", - "Updater" : "업데이터" + "Updater" : "업데이터", + "A new version is available: %s" : "새 버전을 사용할 수 있습니다: %s", + "Open updater" : "업데이터 열기", + "Update channel:" : "업데이트 채널:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "항상 새로운 버전이나 실험 채널로 업그레이드할 수 있지만, 안정 채널로 다운그레이드할 수는 없습니다." }, "nplurals=1; plural=0;"); diff --git a/apps/updatenotification/l10n/ko.json b/apps/updatenotification/l10n/ko.json index 3c135df4f46..ce622c046ba 100644 --- a/apps/updatenotification/l10n/ko.json +++ b/apps/updatenotification/l10n/ko.json @@ -1,5 +1,9 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version}을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 알아보십시오.", - "Updater" : "업데이터" + "Updater" : "업데이터", + "A new version is available: %s" : "새 버전을 사용할 수 있습니다: %s", + "Open updater" : "업데이터 열기", + "Update channel:" : "업데이트 채널:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "항상 새로운 버전이나 실험 채널로 업그레이드할 수 있지만, 안정 채널로 다운그레이드할 수는 없습니다." },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/lt_LT.js b/apps/updatenotification/l10n/lt_LT.js index 85a874dce67..6c22873bf1d 100644 --- a/apps/updatenotification/l10n/lt_LT.js +++ b/apps/updatenotification/l10n/lt_LT.js @@ -1,6 +1,8 @@ OC.L10N.register( "updatenotification", { - "Updater" : "Atnaujinimo programa" + "Updater" : "Atnaujinimo programa", + "Update channel:" : "Atnaujinimo kanalas:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Visada galite atnaujinti į naujesnę versiją / bandomąjį kanalą. Bet niekada žeminti versijos ar pakeisti į stabilų kanalą." }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/updatenotification/l10n/lt_LT.json b/apps/updatenotification/l10n/lt_LT.json index 710be954d1f..db24c0be43b 100644 --- a/apps/updatenotification/l10n/lt_LT.json +++ b/apps/updatenotification/l10n/lt_LT.json @@ -1,4 +1,6 @@ { "translations": { - "Updater" : "Atnaujinimo programa" + "Updater" : "Atnaujinimo programa", + "Update channel:" : "Atnaujinimo kanalas:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Visada galite atnaujinti į naujesnę versiją / bandomąjį kanalą. Bet niekada žeminti versijos ar pakeisti į stabilų kanalą." },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/nb_NO.js b/apps/updatenotification/l10n/nb_NO.js index 254a4fd6c27..62d5121a3a0 100644 --- a/apps/updatenotification/l10n/nb_NO.js +++ b/apps/updatenotification/l10n/nb_NO.js @@ -1,9 +1,14 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "Oppdaterte kanal", "{version} is available. Get more information on how to update." : "{version} er tilgjengelig. Få mer informasjon om å oppdatere.", "Updater" : "Oppdaterer", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Av sikkerhetsgrunner bruker den innebyggede ownCloud-oppdatereren flere påloggingsdetaljer. Klikk følgende knapp for å gå til oppdaterer-siden.", - "Open updater" : "Åpne oppdaterer" + "A new version is available: %s" : "En ny versjon er tilgjengelig: %s", + "Open updater" : "Åpne oppdaterer", + "Your version is up to date." : "Du har nyeste versjon.", + "Checked on %s" : "Sjekket %s", + "Update channel:" : "Oppdateringskanal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kan alltid oppdatere til en nyere versjon / eksperimentell kanal. Men du kan aldri nedgradere til en mer stabil kanal." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/nb_NO.json b/apps/updatenotification/l10n/nb_NO.json index c6dded3fd86..75e9c830208 100644 --- a/apps/updatenotification/l10n/nb_NO.json +++ b/apps/updatenotification/l10n/nb_NO.json @@ -1,7 +1,12 @@ { "translations": { + "Updated channel" : "Oppdaterte kanal", "{version} is available. Get more information on how to update." : "{version} er tilgjengelig. Få mer informasjon om å oppdatere.", "Updater" : "Oppdaterer", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Av sikkerhetsgrunner bruker den innebyggede ownCloud-oppdatereren flere påloggingsdetaljer. Klikk følgende knapp for å gå til oppdaterer-siden.", - "Open updater" : "Åpne oppdaterer" + "A new version is available: %s" : "En ny versjon er tilgjengelig: %s", + "Open updater" : "Åpne oppdaterer", + "Your version is up to date." : "Du har nyeste versjon.", + "Checked on %s" : "Sjekket %s", + "Update channel:" : "Oppdateringskanal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Du kan alltid oppdatere til en nyere versjon / eksperimentell kanal. Men du kan aldri nedgradere til en mer stabil kanal." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/nl.js b/apps/updatenotification/l10n/nl.js index 17350598cfe..9d7c830775f 100644 --- a/apps/updatenotification/l10n/nl.js +++ b/apps/updatenotification/l10n/nl.js @@ -1,9 +1,14 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "Bijgewerkt kanaal", "{version} is available. Get more information on how to update." : "{version} is beschikbaar. Meer informatie over het bijwerken.", "Updater" : "Updater", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Om veiligheidsredenen gebruikt de ingebouwde ownCloud updater extra authenticatie. Klik op de knop om de updater pagina te bezoeken.", - "Open updater" : "Open updater" + "A new version is available: %s" : "Er is een nieuwe versie beschikbaar: %s", + "Open updater" : "Open updater", + "Your version is up to date." : "Uw versie is up to date.", + "Checked on %s" : "Gecontroleerd op %s", + "Update channel:" : "Bijwerkkanaal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "U kunt altijd updaten naar een nieuwere versie of experimenteel kanaal. Maar terug naar een oudere versie of een stabieler kanaal is niet mogelijk." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/nl.json b/apps/updatenotification/l10n/nl.json index 0ef455b9490..564d890bd85 100644 --- a/apps/updatenotification/l10n/nl.json +++ b/apps/updatenotification/l10n/nl.json @@ -1,7 +1,12 @@ { "translations": { + "Updated channel" : "Bijgewerkt kanaal", "{version} is available. Get more information on how to update." : "{version} is beschikbaar. Meer informatie over het bijwerken.", "Updater" : "Updater", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Om veiligheidsredenen gebruikt de ingebouwde ownCloud updater extra authenticatie. Klik op de knop om de updater pagina te bezoeken.", - "Open updater" : "Open updater" + "A new version is available: %s" : "Er is een nieuwe versie beschikbaar: %s", + "Open updater" : "Open updater", + "Your version is up to date." : "Uw versie is up to date.", + "Checked on %s" : "Gecontroleerd op %s", + "Update channel:" : "Bijwerkkanaal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "U kunt altijd updaten naar een nieuwere versie of experimenteel kanaal. Maar terug naar een oudere versie of een stabieler kanaal is niet mogelijk." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/oc.js b/apps/updatenotification/l10n/oc.js index e376387e70e..cc30764b1c3 100644 --- a/apps/updatenotification/l10n/oc.js +++ b/apps/updatenotification/l10n/oc.js @@ -1,6 +1,8 @@ OC.L10N.register( "updatenotification", { - "{version} is available. Get more information on how to update." : "La version {version} es disponibla. Obtenètz mai d'informacions a prepaus d'aquesta mesa a jorn." + "{version} is available. Get more information on how to update." : "La version {version} es disponibla. Obtenètz mai d'informacions a prepaus d'aquesta mesa a jorn.", + "Update channel:" : "Canal de mesa a jorn :", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Podètz a tot moment metre a jorn cap a una version mai recenta o un canal experimental. Pasmens, poiretz pas jamai tornar a un canal mai estable." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/updatenotification/l10n/oc.json b/apps/updatenotification/l10n/oc.json index f17d444506f..b669c1cd19b 100644 --- a/apps/updatenotification/l10n/oc.json +++ b/apps/updatenotification/l10n/oc.json @@ -1,4 +1,6 @@ { "translations": { - "{version} is available. Get more information on how to update." : "La version {version} es disponibla. Obtenètz mai d'informacions a prepaus d'aquesta mesa a jorn." + "{version} is available. Get more information on how to update." : "La version {version} es disponibla. Obtenètz mai d'informacions a prepaus d'aquesta mesa a jorn.", + "Update channel:" : "Canal de mesa a jorn :", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Podètz a tot moment metre a jorn cap a una version mai recenta o un canal experimental. Pasmens, poiretz pas jamai tornar a un canal mai estable." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/pl.js b/apps/updatenotification/l10n/pl.js index 56122490044..b685ad4a963 100644 --- a/apps/updatenotification/l10n/pl.js +++ b/apps/updatenotification/l10n/pl.js @@ -1,6 +1,10 @@ OC.L10N.register( "updatenotification", { - "Updater" : "Aktualizator" + "{version} is available. Get more information on how to update." : "Wersja {version} jest dostępna. Dowiedz się jak zaktualizować.", + "Updater" : "Aktualizator", + "A new version is available: %s" : "Dostępna jest nowa wersja: %s", + "Open updater" : "Otwórz aktualizator", + "Update channel:" : "Kanał aktualizacji:" }, "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/updatenotification/l10n/pl.json b/apps/updatenotification/l10n/pl.json index 6826c9c5dec..0a4ebdc6d95 100644 --- a/apps/updatenotification/l10n/pl.json +++ b/apps/updatenotification/l10n/pl.json @@ -1,4 +1,8 @@ { "translations": { - "Updater" : "Aktualizator" + "{version} is available. Get more information on how to update." : "Wersja {version} jest dostępna. Dowiedz się jak zaktualizować.", + "Updater" : "Aktualizator", + "A new version is available: %s" : "Dostępna jest nowa wersja: %s", + "Open updater" : "Otwórz aktualizator", + "Update channel:" : "Kanał aktualizacji:" },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/pt_BR.js b/apps/updatenotification/l10n/pt_BR.js index b1207b6ad9f..6b5f48697da 100644 --- a/apps/updatenotification/l10n/pt_BR.js +++ b/apps/updatenotification/l10n/pt_BR.js @@ -3,7 +3,9 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informações sobre como atualizar.", "Updater" : "Atualizador", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Por razões de segurança o atualizador interno do ownCloud está usando credenciais adicionais. Para visitar a página atualizador por favor clique no botão a seguir.", - "Open updater" : "Abrir o atualizador" + "A new version is available: %s" : "A nova versão está disponível: %s", + "Open updater" : "Abrir o atualizador", + "Update channel:" : "Atualização do canal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Você pode sempre atualizar para uma versão / canal experimental mais recente. Mas você nunca pode voltar para um canal mais estável." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/updatenotification/l10n/pt_BR.json b/apps/updatenotification/l10n/pt_BR.json index 54551ca44c8..bed50f65e90 100644 --- a/apps/updatenotification/l10n/pt_BR.json +++ b/apps/updatenotification/l10n/pt_BR.json @@ -1,7 +1,9 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informações sobre como atualizar.", "Updater" : "Atualizador", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Por razões de segurança o atualizador interno do ownCloud está usando credenciais adicionais. Para visitar a página atualizador por favor clique no botão a seguir.", - "Open updater" : "Abrir o atualizador" + "A new version is available: %s" : "A nova versão está disponível: %s", + "Open updater" : "Abrir o atualizador", + "Update channel:" : "Atualização do canal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Você pode sempre atualizar para uma versão / canal experimental mais recente. Mas você nunca pode voltar para um canal mais estável." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/pt_PT.js b/apps/updatenotification/l10n/pt_PT.js index 348803f9b95..5fa78c9e0b6 100644 --- a/apps/updatenotification/l10n/pt_PT.js +++ b/apps/updatenotification/l10n/pt_PT.js @@ -3,7 +3,9 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informação sobre como atualizar.", "Updater" : "actualizar", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Por razões de segurança o atualizador ownCloud está a usar credenciais adicionais. Para visitar a página do atualizador clique no seguinte botão.", - "Open updater" : "Abrir atualizador" + "A new version is available: %s" : "Está disponível uma nova versão: %s", + "Open updater" : "Abrir atualizador", + "Update channel:" : "Atualizar canal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Você pode sempre atualizar para uma nova versão / canal experimental. Mas nunca poderá recuar para um canal mais estável." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/pt_PT.json b/apps/updatenotification/l10n/pt_PT.json index bf7414d7128..27b49140cc3 100644 --- a/apps/updatenotification/l10n/pt_PT.json +++ b/apps/updatenotification/l10n/pt_PT.json @@ -1,7 +1,9 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informação sobre como atualizar.", "Updater" : "actualizar", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Por razões de segurança o atualizador ownCloud está a usar credenciais adicionais. Para visitar a página do atualizador clique no seguinte botão.", - "Open updater" : "Abrir atualizador" + "A new version is available: %s" : "Está disponível uma nova versão: %s", + "Open updater" : "Abrir atualizador", + "Update channel:" : "Atualizar canal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Você pode sempre atualizar para uma nova versão / canal experimental. Mas nunca poderá recuar para um canal mais estável." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/ru.js b/apps/updatenotification/l10n/ru.js index c17da7848e4..eb40bd09f54 100644 --- a/apps/updatenotification/l10n/ru.js +++ b/apps/updatenotification/l10n/ru.js @@ -3,7 +3,9 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "Доступна версия {version}. Получить дополнительную информацию о порядке обновления.", "Updater" : "Обновление", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "По соображениям безопасности встроенное средство обновления ownCloud использует дополнительные учетные данные. Для перехода к странице обновления, пожалуйста, нажмите следующую кнопку.", - "Open updater" : "Открыть окно обновления" + "A new version is available: %s" : "Доступна новая версия: %s", + "Open updater" : "Открыть окно обновления", + "Update channel:" : "Канал обновлений:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Вы всегда можете переключится на экспериментальный канал обновлений для получения новейшей версии. Но учтите, что вы не сможете переключиться обратно на канал обновлений для стабильных версий. " }, "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/updatenotification/l10n/ru.json b/apps/updatenotification/l10n/ru.json index 1d857e584f0..584c27c455d 100644 --- a/apps/updatenotification/l10n/ru.json +++ b/apps/updatenotification/l10n/ru.json @@ -1,7 +1,9 @@ { "translations": { "{version} is available. Get more information on how to update." : "Доступна версия {version}. Получить дополнительную информацию о порядке обновления.", "Updater" : "Обновление", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "По соображениям безопасности встроенное средство обновления ownCloud использует дополнительные учетные данные. Для перехода к странице обновления, пожалуйста, нажмите следующую кнопку.", - "Open updater" : "Открыть окно обновления" + "A new version is available: %s" : "Доступна новая версия: %s", + "Open updater" : "Открыть окно обновления", + "Update channel:" : "Канал обновлений:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Вы всегда можете переключится на экспериментальный канал обновлений для получения новейшей версии. Но учтите, что вы не сможете переключиться обратно на канал обновлений для стабильных версий. " },"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/updatenotification/l10n/sk_SK.js b/apps/updatenotification/l10n/sk_SK.js index e684a120e57..e81c3775dd9 100644 --- a/apps/updatenotification/l10n/sk_SK.js +++ b/apps/updatenotification/l10n/sk_SK.js @@ -2,6 +2,8 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version} je dostupná. Získajte viac informácií o postupe aktualizácie.", - "Updater" : "Aktualizátor" + "Updater" : "Aktualizátor", + "A new version is available: %s" : "Je dostupná nová verzia: %s", + "Update channel:" : "Aktualizačný kanál:" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/updatenotification/l10n/sk_SK.json b/apps/updatenotification/l10n/sk_SK.json index 1edd18e5ed2..f930f9e59a2 100644 --- a/apps/updatenotification/l10n/sk_SK.json +++ b/apps/updatenotification/l10n/sk_SK.json @@ -1,5 +1,7 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} je dostupná. Získajte viac informácií o postupe aktualizácie.", - "Updater" : "Aktualizátor" + "Updater" : "Aktualizátor", + "A new version is available: %s" : "Je dostupná nová verzia: %s", + "Update channel:" : "Aktualizačný kanál:" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/sl.js b/apps/updatenotification/l10n/sl.js index f9cb689911f..9280e9c31e6 100644 --- a/apps/updatenotification/l10n/sl.js +++ b/apps/updatenotification/l10n/sl.js @@ -3,7 +3,9 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "Na voljo je nova različica {version}. Na voljo je več podrobnosti o nadgradnji.", "Updater" : "Posodabljalnik", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Zaradi varnostnih razlogov uporablja vgrajeni posodabljalnik ownCloud dodatna poverita. Za dostop do strani posodabljalnika kliknite na gumb za nadaljevanje.", - "Open updater" : "Odpri posodabljalnik" + "A new version is available: %s" : "Na voljo je nova različica: %s", + "Open updater" : "Odpri posodabljalnik", + "Update channel:" : "Posodobi kanal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Nadgradnja na višjo različico ali preizkusni kanal je vedno mogoča, ne pa tudi povrnitev na predhodno, bolj stabilno različico." }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/updatenotification/l10n/sl.json b/apps/updatenotification/l10n/sl.json index ae379cdb405..949e054b912 100644 --- a/apps/updatenotification/l10n/sl.json +++ b/apps/updatenotification/l10n/sl.json @@ -1,7 +1,9 @@ { "translations": { "{version} is available. Get more information on how to update." : "Na voljo je nova različica {version}. Na voljo je več podrobnosti o nadgradnji.", "Updater" : "Posodabljalnik", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Zaradi varnostnih razlogov uporablja vgrajeni posodabljalnik ownCloud dodatna poverita. Za dostop do strani posodabljalnika kliknite na gumb za nadaljevanje.", - "Open updater" : "Odpri posodabljalnik" + "A new version is available: %s" : "Na voljo je nova različica: %s", + "Open updater" : "Odpri posodabljalnik", + "Update channel:" : "Posodobi kanal:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Nadgradnja na višjo različico ali preizkusni kanal je vedno mogoča, ne pa tudi povrnitev na predhodno, bolj stabilno različico." },"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/updatenotification/l10n/sq.js b/apps/updatenotification/l10n/sq.js index afebd62ee2a..dbbbc70fdbe 100644 --- a/apps/updatenotification/l10n/sq.js +++ b/apps/updatenotification/l10n/sq.js @@ -1,9 +1,14 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "Kanali u përditësua", "{version} is available. Get more information on how to update." : "Është gati {version}. Merrni më tepër informacion se si ta përditësoni.", "Updater" : "Përditësues", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Përditësuesi i brendshëm i ownCloud-it, për arsye sigurie po përdor kredenciale shtesë. Që të vizitoni faqen e përditësuesit, ju lutemi, klikoni butonin vijues.", - "Open updater" : "Hapni përditësuesin" + "A new version is available: %s" : "Ka gati një version të ri: %s", + "Open updater" : "Hapni përditësuesin", + "Your version is up to date." : "Versioni juaj është i përditësuar.", + "Checked on %s" : "Kontrolluar më %s", + "Update channel:" : "Kanal përditësimesh:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Mundeni përherë ta përditësoni me një version të ri / kanal eksperimental. Por nuk mund ta ulni kurrë versionin në një version më të qëndrueshëm." }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/sq.json b/apps/updatenotification/l10n/sq.json index 2f943a69347..4706aad0899 100644 --- a/apps/updatenotification/l10n/sq.json +++ b/apps/updatenotification/l10n/sq.json @@ -1,7 +1,12 @@ { "translations": { + "Updated channel" : "Kanali u përditësua", "{version} is available. Get more information on how to update." : "Është gati {version}. Merrni më tepër informacion se si ta përditësoni.", "Updater" : "Përditësues", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Përditësuesi i brendshëm i ownCloud-it, për arsye sigurie po përdor kredenciale shtesë. Që të vizitoni faqen e përditësuesit, ju lutemi, klikoni butonin vijues.", - "Open updater" : "Hapni përditësuesin" + "A new version is available: %s" : "Ka gati një version të ri: %s", + "Open updater" : "Hapni përditësuesin", + "Your version is up to date." : "Versioni juaj është i përditësuar.", + "Checked on %s" : "Kontrolluar më %s", + "Update channel:" : "Kanal përditësimesh:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Mundeni përherë ta përditësoni me një version të ri / kanal eksperimental. Por nuk mund ta ulni kurrë versionin në një version më të qëndrueshëm." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/sr.js b/apps/updatenotification/l10n/sr.js index 974698fbc2c..c051974f5da 100644 --- a/apps/updatenotification/l10n/sr.js +++ b/apps/updatenotification/l10n/sr.js @@ -1,7 +1,14 @@ OC.L10N.register( "updatenotification", { + "Updated channel" : "Канал ажуриран", "{version} is available. Get more information on how to update." : "Верзија {version} је доступна. Сазнајте како да ажурирате.", - "Updater" : "Ажурирање" + "Updater" : "Ажурирање", + "A new version is available: %s" : "Доступна је нова верзија: %s", + "Open updater" : "Отвори ажурирање", + "Your version is up to date." : "Ваша верзија је ажурна.", + "Checked on %s" : "Проверено %s", + "Update channel:" : "Канал за ажурирање:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Увек можете да надоградите на новију верзију/експериментални канал. Али не можете се вратити на стабилни канал." }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/updatenotification/l10n/sr.json b/apps/updatenotification/l10n/sr.json index 41e5da4eb1a..c33fbd7574e 100644 --- a/apps/updatenotification/l10n/sr.json +++ b/apps/updatenotification/l10n/sr.json @@ -1,5 +1,12 @@ { "translations": { + "Updated channel" : "Канал ажуриран", "{version} is available. Get more information on how to update." : "Верзија {version} је доступна. Сазнајте како да ажурирате.", - "Updater" : "Ажурирање" + "Updater" : "Ажурирање", + "A new version is available: %s" : "Доступна је нова верзија: %s", + "Open updater" : "Отвори ажурирање", + "Your version is up to date." : "Ваша верзија је ажурна.", + "Checked on %s" : "Проверено %s", + "Update channel:" : "Канал за ажурирање:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Увек можете да надоградите на новију верзију/експериментални канал. Али не можете се вратити на стабилни канал." },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/sv.js b/apps/updatenotification/l10n/sv.js index 274c6f8eae5..410143a050d 100644 --- a/apps/updatenotification/l10n/sv.js +++ b/apps/updatenotification/l10n/sv.js @@ -3,7 +3,7 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} är tillgänglig. Få mer information om hur du uppdaterar.", "Updater" : "Uppdaterare", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Utav säkerhetsskäl använder den inbyggda ownCloud-uppdateraren ytterligare inlogginingsiformation. För att öppna sidan för uppdatering vänligen tryck på följande knapp.", + "A new version is available: %s" : "En ny version är tillgänglig: %s", "Open updater" : "Öppna uppdateraren" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/updatenotification/l10n/sv.json b/apps/updatenotification/l10n/sv.json index d36a8376d43..3e7855a9994 100644 --- a/apps/updatenotification/l10n/sv.json +++ b/apps/updatenotification/l10n/sv.json @@ -1,7 +1,7 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} är tillgänglig. Få mer information om hur du uppdaterar.", "Updater" : "Uppdaterare", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "Utav säkerhetsskäl använder den inbyggda ownCloud-uppdateraren ytterligare inlogginingsiformation. För att öppna sidan för uppdatering vänligen tryck på följande knapp.", + "A new version is available: %s" : "En ny version är tillgänglig: %s", "Open updater" : "Öppna uppdateraren" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/th_TH.js b/apps/updatenotification/l10n/th_TH.js index 7ebc9b543a3..9a1213cd605 100644 --- a/apps/updatenotification/l10n/th_TH.js +++ b/apps/updatenotification/l10n/th_TH.js @@ -3,7 +3,8 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "{version} สามารถใช้ได้ รับข้อมูลเพิ่มเติมเกี่ยวกับวิธีการอัพเดท", "Updater" : "อัพเดท", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "เพื่อเหตุผลเรื่องความปลอดภัยของ ownCloud Updater จึงจำเป็นต้องใช้ข้อมูลใบรับรองที่เพิ่มขึ้น ไปยังหน้าอัพเดทโปรดคลิกที่ปุ่มต่อไปนี้", - "Open updater" : "เปิดตัวอัพเดท" + "Open updater" : "เปิดตัวอัพเดท", + "Update channel:" : "ปรับปรุงช่อง:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "คุณสามารถอัพเดทเป็นรุ่นที่ใหม่กว่าหรือใช้ตัวเบต้า แต่คุณไม่สามารถกลับไปใช้รุ่นที่เก่ากว่าเนื่องจากอาจมีปัญหาเรื่องความเสถียร" }, "nplurals=1; plural=0;"); diff --git a/apps/updatenotification/l10n/th_TH.json b/apps/updatenotification/l10n/th_TH.json index 96fe30d55e3..f603cc3ff29 100644 --- a/apps/updatenotification/l10n/th_TH.json +++ b/apps/updatenotification/l10n/th_TH.json @@ -1,7 +1,8 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} สามารถใช้ได้ รับข้อมูลเพิ่มเติมเกี่ยวกับวิธีการอัพเดท", "Updater" : "อัพเดท", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "เพื่อเหตุผลเรื่องความปลอดภัยของ ownCloud Updater จึงจำเป็นต้องใช้ข้อมูลใบรับรองที่เพิ่มขึ้น ไปยังหน้าอัพเดทโปรดคลิกที่ปุ่มต่อไปนี้", - "Open updater" : "เปิดตัวอัพเดท" + "Open updater" : "เปิดตัวอัพเดท", + "Update channel:" : "ปรับปรุงช่อง:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "คุณสามารถอัพเดทเป็นรุ่นที่ใหม่กว่าหรือใช้ตัวเบต้า แต่คุณไม่สามารถกลับไปใช้รุ่นที่เก่ากว่าเนื่องจากอาจมีปัญหาเรื่องความเสถียร" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/tr.js b/apps/updatenotification/l10n/tr.js index 3abe821a5ea..26b00321924 100644 --- a/apps/updatenotification/l10n/tr.js +++ b/apps/updatenotification/l10n/tr.js @@ -2,6 +2,9 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "Sürüm {version} hazır. Nasıl güncelleyeceğinizle ilgili daha fazla bilgi alın.", - "Updater" : "Güncelleyici" + "Updater" : "Güncelleyici", + "A new version is available: %s" : "Yeni bir sürüm mevcut: %s", + "Update channel:" : "Güncelleme kanalı:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Her zaman yeni / deneysel bir sürüme güncelleyebilirsiniz, ancak daha düşük bir kararlı sürüme düşüremezsiniz." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/updatenotification/l10n/tr.json b/apps/updatenotification/l10n/tr.json index dba8d5533dd..07f42475269 100644 --- a/apps/updatenotification/l10n/tr.json +++ b/apps/updatenotification/l10n/tr.json @@ -1,5 +1,8 @@ { "translations": { "{version} is available. Get more information on how to update." : "Sürüm {version} hazır. Nasıl güncelleyeceğinizle ilgili daha fazla bilgi alın.", - "Updater" : "Güncelleyici" + "Updater" : "Güncelleyici", + "A new version is available: %s" : "Yeni bir sürüm mevcut: %s", + "Update channel:" : "Güncelleme kanalı:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Her zaman yeni / deneysel bir sürüme güncelleyebilirsiniz, ancak daha düşük bir kararlı sürüme düşüremezsiniz." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/uk.js b/apps/updatenotification/l10n/uk.js index 0a594d6d47c..4405c965360 100644 --- a/apps/updatenotification/l10n/uk.js +++ b/apps/updatenotification/l10n/uk.js @@ -2,6 +2,8 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version} доступна. Отримати більш детальну інформацію про те, як оновити.", - "Updater" : "Оновлення" + "Updater" : "Оновлення", + "A new version is available: %s" : "Доступна нова версія: %s", + "Update channel:" : "Канал оновлення:" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/updatenotification/l10n/uk.json b/apps/updatenotification/l10n/uk.json index c5a3f6ce9ff..5444d30759c 100644 --- a/apps/updatenotification/l10n/uk.json +++ b/apps/updatenotification/l10n/uk.json @@ -1,5 +1,7 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} доступна. Отримати більш детальну інформацію про те, як оновити.", - "Updater" : "Оновлення" + "Updater" : "Оновлення", + "A new version is available: %s" : "Доступна нова версія: %s", + "Update channel:" : "Канал оновлення:" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/zh_CN.js b/apps/updatenotification/l10n/zh_CN.js index 7a5dc8b9f71..fd705d767c7 100644 --- a/apps/updatenotification/l10n/zh_CN.js +++ b/apps/updatenotification/l10n/zh_CN.js @@ -3,7 +3,8 @@ OC.L10N.register( { "{version} is available. Get more information on how to update." : "新版本 {version} 已可以使用。获取更多升级相关信息。", "Updater" : "更新管理器", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "出于安全考虑，内置ownCloud更新管理器需使用附加的凭证。要访问的页面更新，请点击下面的按钮。", - "Open updater" : "打开更新管理器" + "Open updater" : "打开更新管理器", + "Update channel:" : "更新通道：", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "您可以随时更新到新版本 / 实验通道。但你永远不能降级到更稳定的通道。" }, "nplurals=1; plural=0;"); diff --git a/apps/updatenotification/l10n/zh_CN.json b/apps/updatenotification/l10n/zh_CN.json index e7d091d28ce..b95589b11a1 100644 --- a/apps/updatenotification/l10n/zh_CN.json +++ b/apps/updatenotification/l10n/zh_CN.json @@ -1,7 +1,8 @@ { "translations": { "{version} is available. Get more information on how to update." : "新版本 {version} 已可以使用。获取更多升级相关信息。", "Updater" : "更新管理器", - "For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button." : "出于安全考虑，内置ownCloud更新管理器需使用附加的凭证。要访问的页面更新，请点击下面的按钮。", - "Open updater" : "打开更新管理器" + "Open updater" : "打开更新管理器", + "Update channel:" : "更新通道：", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "您可以随时更新到新版本 / 实验通道。但你永远不能降级到更稳定的通道。" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/updatenotification/l10n/zh_TW.js b/apps/updatenotification/l10n/zh_TW.js index 2db4e854304..db8798e4a90 100644 --- a/apps/updatenotification/l10n/zh_TW.js +++ b/apps/updatenotification/l10n/zh_TW.js @@ -2,6 +2,8 @@ OC.L10N.register( "updatenotification", { "{version} is available. Get more information on how to update." : "{version} 釋出了，可以更新", - "Updater" : "更新者" + "Updater" : "更新者", + "Update channel:" : "更新通道:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "您可以隨時更新至較新的版本 / 實驗通道，但您不能降版至更穩定的通道。" }, "nplurals=1; plural=0;"); diff --git a/apps/updatenotification/l10n/zh_TW.json b/apps/updatenotification/l10n/zh_TW.json index 3ebac87de41..2b0baa5eace 100644 --- a/apps/updatenotification/l10n/zh_TW.json +++ b/apps/updatenotification/l10n/zh_TW.json @@ -1,5 +1,7 @@ { "translations": { "{version} is available. Get more information on how to update." : "{version} 釋出了，可以更新", - "Updater" : "更新者" + "Updater" : "更新者", + "Update channel:" : "更新通道:", + "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "您可以隨時更新至較新的版本 / 實驗通道，但您不能降版至更穩定的通道。" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php index 647c88dea17..c1adc8d0d3e 100644 --- a/apps/updatenotification/templates/admin.php +++ b/apps/updatenotification/templates/admin.php @@ -1,8 +1,42 @@ -<?php script('updatenotification', 'admin') ?> -<form id="oca_updatenotification" class="section"> +<?php + script('updatenotification', 'admin'); + + /** @var array $_ */ + /** @var bool $isNewVersionAvailable */ + $isNewVersionAvailable = $_['isNewVersionAvailable']; + /** @var string $newVersionString */ + $newVersionString = $_['newVersionString']; + /** @var string $lastCheckedDate */ + $lastCheckedDate = $_['lastChecked']; + /** @var array $channels */ + $channels = $_['channels']; + /** @var string $currentChannel */ + $currentChannel = $_['currentChannel']; +?> +<form id="oca_updatenotification_section" class="section"> <h2><?php p($l->t('Updater')); ?></h2> + + <?php if($isNewVersionAvailable === true): ?> + <strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong> + <input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>"> + <?php else: ?> + <strong><?php print_unescaped($l->t('Your version is up to date.')); ?></strong> + <span class="icon-info svg" title="<?php p($l->t('Checked on %s', [$lastCheckedDate])) ?>"></span> + <?php endif; ?> + <p> - <?php p($l->t('For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button.')) ?> + <label for="release-channel"><?php p($l->t('Update channel:')) ?></label> + <select id="release-channel"> + <option value="<?php p($currentChannel); ?>"><?php p($currentChannel); ?></option> + <?php foreach ($channels as $channel => $channelTitle){ ?> + <option value="<?php p($channelTitle) ?>"> + <?php p($channelTitle) ?> + </option> + <?php } ?> + </select> + <span id="channel_save_msg"></span> + </p> + <p> + <em><?php p($l->t('You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel.')); ?></em> </p> - <input type="button" id="oca_updatenotification" value="<?php p($l->t('Open updater')) ?>"> </form> diff --git a/apps/updatenotification/tests/controller/AdminControllerTest.php b/apps/updatenotification/tests/controller/AdminControllerTest.php index 5a0f9d21469..50adcd2028b 100644 --- a/apps/updatenotification/tests/controller/AdminControllerTest.php +++ b/apps/updatenotification/tests/controller/AdminControllerTest.php @@ -22,11 +22,14 @@ namespace OCA\UpdateNotification\Tests\Controller; use OCA\UpdateNotification\Controller\AdminController; +use OCA\UpdateNotification\UpdateChecker; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; use OCP\IConfig; +use OCP\IDateTimeFormatter; +use OCP\IL10N; use OCP\IRequest; use OCP\Security\ISecureRandom; use Test\TestCase; @@ -44,6 +47,12 @@ class AdminControllerTest extends TestCase { private $adminController; /** @var ITimeFactory */ private $timeFactory; + /** @var IL10N */ + private $l10n; + /** @var UpdateChecker */ + private $updateChecker; + /** @var IDateTimeFormatter */ + private $dateTimeFormatter; public function setUp() { parent::setUp(); @@ -53,6 +62,10 @@ class AdminControllerTest extends TestCase { $this->secureRandom = $this->getMock('\\OCP\\Security\\ISecureRandom'); $this->config = $this->getMock('\\OCP\\IConfig'); $this->timeFactory = $this->getMock('\\OCP\\AppFramework\\Utility\\ITimeFactory'); + $this->l10n = $this->getMock('\\OCP\\IL10N'); + $this->updateChecker = $this->getMockBuilder('\\OCA\\UpdateNotification\\UpdateChecker') + ->disableOriginalConstructor()->getMock(); + $this->dateTimeFormatter = $this->getMock('\\OCP\\IDateTimeFormatter'); $this->adminController = new AdminController( 'updatenotification', @@ -60,15 +73,94 @@ class AdminControllerTest extends TestCase { $this->jobList, $this->secureRandom, $this->config, - $this->timeFactory + $this->timeFactory, + $this->l10n, + $this->updateChecker, + $this->dateTimeFormatter ); } - public function testDisplayPanel() { - $expected = new TemplateResponse('updatenotification', 'admin', [], ''); + public function testDisplayPanelWithUpdate() { + $channels = [ + 'daily', + 'beta', + 'stable', + 'production', + ]; + $currentChannel = \OCP\Util::getChannel(); + + // Remove the currently used channel from the channels list + if(($key = array_search($currentChannel, $channels)) !== false) { + unset($channels[$key]); + } + + $this->config + ->expects($this->once()) + ->method('getAppValue') + ->with('core', 'lastupdatedat') + ->willReturn('12345'); + $this->dateTimeFormatter + ->expects($this->once()) + ->method('formatDateTime') + ->with('12345') + ->willReturn('LastCheckedReturnValue'); + $this->updateChecker + ->expects($this->once()) + ->method('getUpdateState') + ->willReturn(['foo' => 'bar']); + + $params = [ + 'isNewVersionAvailable' => true, + 'lastChecked' => 'LastCheckedReturnValue', + 'currentChannel' => \OCP\Util::getChannel(), + 'channels' => $channels, + ]; + + $expected = new TemplateResponse('updatenotification', 'admin', $params, ''); + $this->assertEquals($expected, $this->adminController->displayPanel()); + } + + public function testDisplayPanelWithoutUpdate() { + $channels = [ + 'daily', + 'beta', + 'stable', + 'production', + ]; + $currentChannel = \OCP\Util::getChannel(); + + // Remove the currently used channel from the channels list + if(($key = array_search($currentChannel, $channels)) !== false) { + unset($channels[$key]); + } + + $this->config + ->expects($this->once()) + ->method('getAppValue') + ->with('core', 'lastupdatedat') + ->willReturn('12345'); + $this->dateTimeFormatter + ->expects($this->once()) + ->method('formatDateTime') + ->with('12345') + ->willReturn('LastCheckedReturnValue'); + $this->updateChecker + ->expects($this->once()) + ->method('getUpdateState') + ->willReturn([]); + + $params = [ + 'isNewVersionAvailable' => false, + 'lastChecked' => 'LastCheckedReturnValue', + 'currentChannel' => \OCP\Util::getChannel(), + 'channels' => $channels, + ]; + + $expected = new TemplateResponse('updatenotification', 'admin', $params, ''); $this->assertEquals($expected, $this->adminController->displayPanel()); } + public function testCreateCredentials() { $this->jobList ->expects($this->once()) diff --git a/apps/user_ldap/l10n/fil.js b/apps/user_ldap/l10n/fil.js index 95c97db2f9c..db848ae4c2c 100644 --- a/apps/user_ldap/l10n/fil.js +++ b/apps/user_ldap/l10n/fil.js @@ -1,7 +1,6 @@ OC.L10N.register( "user_ldap", { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] + "Password" : "Password" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/user_ldap/l10n/fil.json b/apps/user_ldap/l10n/fil.json index 8e0cd6f6783..b60f17590ba 100644 --- a/apps/user_ldap/l10n/fil.json +++ b/apps/user_ldap/l10n/fil.json @@ -1,5 +1,4 @@ { "translations": { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] + "Password" : "Password" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js index d54be2c546b..e093f1b73a0 100644 --- a/apps/user_ldap/l10n/he.js +++ b/apps/user_ldap/l10n/he.js @@ -127,12 +127,15 @@ OC.L10N.register( "Group Display Name Field" : "שדה שם תצוגה לקבוצה", "Base Group Tree" : "עץ קבוצה בסיסי", "Group Search Attributes" : "מאפייני חיפוש קבוצה", + "Group-Member association" : "שיוך חברי-קבוצה", "Dynamic Group Member URL" : "נתיב חבר קבוצה דינמית", + "Nested Groups" : "קבוצות משנה", "Special Attributes" : "מאפיינים מיוחדים", "Quota Field" : "שדה מכסה", "Quota Default" : "ברירת מחדל מכסה", "in bytes" : "בבתים", "Email Field" : "שדה דואר אלקטרוני", + "User Home Folder Naming Rule" : "כלל קביעת שם תיקיית בית למשתמש", "Internal Username" : "שם משתמש פנימי", "Internal Username Attribute:" : "מאפיין שם משתמש פנימי:", "Override UUID detection" : "דריסת זיהוי UUID", diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json index eb69f016698..8e8805e944d 100644 --- a/apps/user_ldap/l10n/he.json +++ b/apps/user_ldap/l10n/he.json @@ -125,12 +125,15 @@ "Group Display Name Field" : "שדה שם תצוגה לקבוצה", "Base Group Tree" : "עץ קבוצה בסיסי", "Group Search Attributes" : "מאפייני חיפוש קבוצה", + "Group-Member association" : "שיוך חברי-קבוצה", "Dynamic Group Member URL" : "נתיב חבר קבוצה דינמית", + "Nested Groups" : "קבוצות משנה", "Special Attributes" : "מאפיינים מיוחדים", "Quota Field" : "שדה מכסה", "Quota Default" : "ברירת מחדל מכסה", "in bytes" : "בבתים", "Email Field" : "שדה דואר אלקטרוני", + "User Home Folder Naming Rule" : "כלל קביעת שם תיקיית בית למשתמש", "Internal Username" : "שם משתמש פנימי", "Internal Username Attribute:" : "מאפיין שם משתמש פנימי:", "Override UUID detection" : "דריסת זיהוי UUID", diff --git a/apps/user_ldap/l10n/hy.js b/apps/user_ldap/l10n/hy.js index 469515bc42e..6e3fc1a22c8 100644 --- a/apps/user_ldap/l10n/hy.js +++ b/apps/user_ldap/l10n/hy.js @@ -2,6 +2,8 @@ OC.L10N.register( "user_ldap", { "Groups" : "Խմբեր", - "Password" : "Գաղտնաբառ" + "Help" : "Օգնություն", + "Password" : "Գաղտնաբառ", + "Continue" : "Շարունակել" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/hy.json b/apps/user_ldap/l10n/hy.json index 8b8bf5bd500..cff0593a7be 100644 --- a/apps/user_ldap/l10n/hy.json +++ b/apps/user_ldap/l10n/hy.json @@ -1,5 +1,7 @@ { "translations": { "Groups" : "Խմբեր", - "Password" : "Գաղտնաբառ" + "Help" : "Օգնություն", + "Password" : "Գաղտնաբառ", + "Continue" : "Շարունակել" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/user_ldap/l10n/ko.js b/apps/user_ldap/l10n/ko.js index 0ed95377acb..74720e4fe83 100644 --- a/apps/user_ldap/l10n/ko.js +++ b/apps/user_ldap/l10n/ko.js @@ -122,6 +122,8 @@ OC.L10N.register( "Directory Settings" : "디렉터리 설정", "User Display Name Field" : "사용자의 표시 이름 필드", "The LDAP attribute to use to generate the user's display name." : "사용자 표시 이름을 생성할 때 사용할 LDAP 속성입니다.", + "2nd User Display Name Field" : "보조 사용자 표시 이름 필드", + "Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«." : "선택 사항입니다. 괄호 안에 추가로 표시할 정보를 포함하는 LDAP 속성입니다. 예: 홍길동(gildong.hong@example.org)", "Base User Tree" : "기본 사용자 트리", "One User Base DN per line" : "사용자 DN을 한 줄에 하나씩 입력하십시오", "User Search Attributes" : "사용자 검색 속성", @@ -132,6 +134,8 @@ OC.L10N.register( "One Group Base DN per line" : "그룹 기본 DN을 한 줄에 하나씩 입력하십시오", "Group Search Attributes" : "그룹 검색 속성", "Group-Member association" : "그룹-구성원 연결", + "Dynamic Group Member URL" : "동적 그룹 구성원 URL", + "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "그룹에 포함될 객체를 결정하는 LDAP 검색 URL을 포함하는 그룹 객체의 LDAP 속성입니다.(비워 두면 동적 그룹 구성원 기능을 사용하지 않습니다.)", "Nested Groups" : "그룹 안의 그룹", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "이 설정을 사용하면 그룹 안의 그룹을 지원합니다.(그룹 구성원 속성이 DN을 포함하는 경우에만 사용 가능)", "Paging chunksize" : "페이지 청크 크기", diff --git a/apps/user_ldap/l10n/ko.json b/apps/user_ldap/l10n/ko.json index 3fccad0577c..c71cede0ba2 100644 --- a/apps/user_ldap/l10n/ko.json +++ b/apps/user_ldap/l10n/ko.json @@ -120,6 +120,8 @@ "Directory Settings" : "디렉터리 설정", "User Display Name Field" : "사용자의 표시 이름 필드", "The LDAP attribute to use to generate the user's display name." : "사용자 표시 이름을 생성할 때 사용할 LDAP 속성입니다.", + "2nd User Display Name Field" : "보조 사용자 표시 이름 필드", + "Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«." : "선택 사항입니다. 괄호 안에 추가로 표시할 정보를 포함하는 LDAP 속성입니다. 예: 홍길동(gildong.hong@example.org)", "Base User Tree" : "기본 사용자 트리", "One User Base DN per line" : "사용자 DN을 한 줄에 하나씩 입력하십시오", "User Search Attributes" : "사용자 검색 속성", @@ -130,6 +132,8 @@ "One Group Base DN per line" : "그룹 기본 DN을 한 줄에 하나씩 입력하십시오", "Group Search Attributes" : "그룹 검색 속성", "Group-Member association" : "그룹-구성원 연결", + "Dynamic Group Member URL" : "동적 그룹 구성원 URL", + "The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)" : "그룹에 포함될 객체를 결정하는 LDAP 검색 URL을 포함하는 그룹 객체의 LDAP 속성입니다.(비워 두면 동적 그룹 구성원 기능을 사용하지 않습니다.)", "Nested Groups" : "그룹 안의 그룹", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "이 설정을 사용하면 그룹 안의 그룹을 지원합니다.(그룹 구성원 속성이 DN을 포함하는 경우에만 사용 가능)", "Paging chunksize" : "페이지 청크 크기", diff --git a/apps/user_ldap/l10n/ne.js b/apps/user_ldap/l10n/ne.js deleted file mode 100644 index 37042a4f412..00000000000 --- a/apps/user_ldap/l10n/ne.js +++ /dev/null @@ -1,7 +0,0 @@ -OC.L10N.register( - "user_ldap", - { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/ne.json b/apps/user_ldap/l10n/ne.json deleted file mode 100644 index 521de7ba1a8..00000000000 --- a/apps/user_ldap/l10n/ne.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "translations": { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js index 6de5a70d3f5..75a70c81528 100644 --- a/apps/user_ldap/l10n/nl.js +++ b/apps/user_ldap/l10n/nl.js @@ -45,7 +45,7 @@ OC.L10N.register( "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Er trad een verbindingsfout naar LDAP / AD op, verifieer servernaam, poort en inloggegevens.", "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "De %uid opvultekst ontbreekt. Die wordt vervangen door de inlognaam bij het bevragen van LDAP / AD.", "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.", + "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.", "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"], "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kon het weergavenaam attribuut van de gebruiker niet vinden. Geef het zelf op in de geavanceerde ldap instellingen.", diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json index 82e9c6d72f1..fd39a10d54f 100644 --- a/apps/user_ldap/l10n/nl.json +++ b/apps/user_ldap/l10n/nl.json @@ -43,7 +43,7 @@ "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Er trad een verbindingsfout naar LDAP / AD op, verifieer servernaam, poort en inloggegevens.", "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "De %uid opvultekst ontbreekt. Die wordt vervangen door de inlognaam bij het bevragen van LDAP / AD.", "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.", + "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.", "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"], "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kon het weergavenaam attribuut van de gebruiker niet vinden. Geef het zelf op in de geavanceerde ldap instellingen.", diff --git a/apps/user_ldap/l10n/or_IN.js b/apps/user_ldap/l10n/or_IN.js deleted file mode 100644 index 37042a4f412..00000000000 --- a/apps/user_ldap/l10n/or_IN.js +++ /dev/null @@ -1,7 +0,0 @@ -OC.L10N.register( - "user_ldap", - { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/or_IN.json b/apps/user_ldap/l10n/or_IN.json deleted file mode 100644 index 521de7ba1a8..00000000000 --- a/apps/user_ldap/l10n/or_IN.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "translations": { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js index e2e3a44d292..f72ab777835 100644 --- a/apps/user_ldap/l10n/pl.js +++ b/apps/user_ldap/l10n/pl.js @@ -12,6 +12,7 @@ OC.L10N.register( "No data specified" : "Nie określono danych", " Could not set configuration %s" : "Nie można ustawić konfiguracji %s", "Action does not exist" : "Akcja nie istnieje", + "The Base DN appears to be wrong" : "Base DN wygląda na błedne", "Configuration incorrect" : "Konfiguracja niepoprawna", "Configuration incomplete" : "Konfiguracja niekompletna", "Configuration OK" : "Konfiguracja poprawna", @@ -19,9 +20,17 @@ OC.L10N.register( "Select object classes" : "Wybierz obiekty klas", "Please check the credentials, they seem to be wrong." : "Sprawdź dane logowania, wydają się być nieprawidłowe.", "Please specify the port, it could not be auto-detected." : "Podaj port, nie można ustalić go automatycznie.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN nie mógł zostać wykryty automatycznie, proszę sprawdzić ustawienia hosta, port oraz dane dostępowe", + "Could not detect Base DN, please enter it manually." : "Nie udało się wykryć Base DN, proszę podać ręcznie.", "{nthServer}. Server" : "{nthServer}. Serwer", + "No object found in the given Base DN. Please revise." : "Brak obiektów w podanym Base DN. Proszę sprawdzić.", + "More than 1,000 directory entries available." : "Ponad 1,000 wpisów katalogowych dostępne.", + " entries available within the provided Base DN" : "wpisów dostępnych w podanym Base DN ", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Wystąpił błąd. Proszę sprawdzić Base DN oraz ustawienia połączenia i dane dostępowe.", "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?", "Confirm Deletion" : "Potwierdź usunięcie", + "Mappings cleared successfully!" : "Mapowanie wyczyszczone!", + "Error while clearing the mappings." : "Błąd podczas czyszczenia mapowania.", "Select attributes" : "Wybierz atrybuty", "_%s group found_::_%s groups found_" : ["%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"], "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"], @@ -44,7 +53,7 @@ OC.L10N.register( "Verify settings and count groups" : "Zweryfikuj ustawienia i policz grupy", "When logging in, %s will find the user based on the following attributes:" : "Podczas logowania, %s znajdzie użytkownika na podstawie następujących atrybutów:", "LDAP / AD Username:" : "Nazwa użytkownika LDAP / AD:", - "LDAP / AD Email Address:" : "Adres email LDAP / AD:", + "LDAP / AD Email Address:" : "Adres email LDAP/AD:", "Other Attributes:" : "Inne atrybuty:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"", "Verify settings" : "Weryfikuj ustawienia", @@ -99,6 +108,7 @@ OC.L10N.register( "One Group Base DN per line" : "Jedna grupa bazy DN na linię", "Group Search Attributes" : "Grupa atrybutów wyszukaj", "Group-Member association" : "Członek grupy stowarzyszenia", + "Dynamic Group Member URL" : "URL Członka Grupy Dynamicznej", "Nested Groups" : "Grupy zagnieżdżone", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Kiedy włączone, grupy, które zawierają grupy, są wspierane. (Działa tylko, jeśli członek grupy ma ustawienie DNs)", "Paging chunksize" : "Wielkość stronicowania", diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json index 1e518980dab..6b9e7119cdc 100644 --- a/apps/user_ldap/l10n/pl.json +++ b/apps/user_ldap/l10n/pl.json @@ -10,6 +10,7 @@ "No data specified" : "Nie określono danych", " Could not set configuration %s" : "Nie można ustawić konfiguracji %s", "Action does not exist" : "Akcja nie istnieje", + "The Base DN appears to be wrong" : "Base DN wygląda na błedne", "Configuration incorrect" : "Konfiguracja niepoprawna", "Configuration incomplete" : "Konfiguracja niekompletna", "Configuration OK" : "Konfiguracja poprawna", @@ -17,9 +18,17 @@ "Select object classes" : "Wybierz obiekty klas", "Please check the credentials, they seem to be wrong." : "Sprawdź dane logowania, wydają się być nieprawidłowe.", "Please specify the port, it could not be auto-detected." : "Podaj port, nie można ustalić go automatycznie.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN nie mógł zostać wykryty automatycznie, proszę sprawdzić ustawienia hosta, port oraz dane dostępowe", + "Could not detect Base DN, please enter it manually." : "Nie udało się wykryć Base DN, proszę podać ręcznie.", "{nthServer}. Server" : "{nthServer}. Serwer", + "No object found in the given Base DN. Please revise." : "Brak obiektów w podanym Base DN. Proszę sprawdzić.", + "More than 1,000 directory entries available." : "Ponad 1,000 wpisów katalogowych dostępne.", + " entries available within the provided Base DN" : "wpisów dostępnych w podanym Base DN ", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Wystąpił błąd. Proszę sprawdzić Base DN oraz ustawienia połączenia i dane dostępowe.", "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?", "Confirm Deletion" : "Potwierdź usunięcie", + "Mappings cleared successfully!" : "Mapowanie wyczyszczone!", + "Error while clearing the mappings." : "Błąd podczas czyszczenia mapowania.", "Select attributes" : "Wybierz atrybuty", "_%s group found_::_%s groups found_" : ["%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"], "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"], @@ -42,7 +51,7 @@ "Verify settings and count groups" : "Zweryfikuj ustawienia i policz grupy", "When logging in, %s will find the user based on the following attributes:" : "Podczas logowania, %s znajdzie użytkownika na podstawie następujących atrybutów:", "LDAP / AD Username:" : "Nazwa użytkownika LDAP / AD:", - "LDAP / AD Email Address:" : "Adres email LDAP / AD:", + "LDAP / AD Email Address:" : "Adres email LDAP/AD:", "Other Attributes:" : "Inne atrybuty:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"", "Verify settings" : "Weryfikuj ustawienia", @@ -97,6 +106,7 @@ "One Group Base DN per line" : "Jedna grupa bazy DN na linię", "Group Search Attributes" : "Grupa atrybutów wyszukaj", "Group-Member association" : "Członek grupy stowarzyszenia", + "Dynamic Group Member URL" : "URL Członka Grupy Dynamicznej", "Nested Groups" : "Grupy zagnieżdżone", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Kiedy włączone, grupy, które zawierają grupy, są wspierane. (Działa tylko, jeśli członek grupy ma ustawienie DNs)", "Paging chunksize" : "Wielkość stronicowania", diff --git a/apps/user_ldap/l10n/uz.js b/apps/user_ldap/l10n/uz.js deleted file mode 100644 index 5494dcae62e..00000000000 --- a/apps/user_ldap/l10n/uz.js +++ /dev/null @@ -1,7 +0,0 @@ -OC.L10N.register( - "user_ldap", - { - "_%s group found_::_%s groups found_" : [""], - "_%s user found_::_%s users found_" : [""] -}, -"nplurals=1; plural=0;"); diff --git a/apps/user_ldap/l10n/uz.json b/apps/user_ldap/l10n/uz.json deleted file mode 100644 index 75f0f056cc4..00000000000 --- a/apps/user_ldap/l10n/uz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "translations": { - "_%s group found_::_%s groups found_" : [""], - "_%s user found_::_%s users found_" : [""] -},"pluralForm" :"nplurals=1; plural=0;" -}
\ No newline at end of file diff --git a/apps/user_ldap/l10n/yo.js b/apps/user_ldap/l10n/yo.js deleted file mode 100644 index 37042a4f412..00000000000 --- a/apps/user_ldap/l10n/yo.js +++ /dev/null @@ -1,7 +0,0 @@ -OC.L10N.register( - "user_ldap", - { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/yo.json b/apps/user_ldap/l10n/yo.json deleted file mode 100644 index 521de7ba1a8..00000000000 --- a/apps/user_ldap/l10n/yo.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "translations": { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index 74e2af45269..7002aaadaa5 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -61,7 +61,7 @@ abstract class Proxy { static $userMap; static $groupMap; static $db; - static $userManager; + static $coreUserManager; if(is_null($fs)) { $ocConfig = \OC::$server->getConfig(); $fs = new FilesystemHelper(); @@ -70,10 +70,10 @@ abstract class Proxy { $db = \OC::$server->getDatabaseConnection(); $userMap = new UserMapping($db); $groupMap = new GroupMapping($db); - $userManager = \OC::$server->getUserManager(); + $coreUserManager = \OC::$server->getUserManager(); } $userManager = - new user\Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $userManager); + new user\Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $coreUserManager); $connector = new Connection($this->ldap, $configPrefix); $access = new Access($connector, $this->ldap, $userManager); $access->setUserMapper($userMap); diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index 04a706f387b..8c32c04523c 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -285,6 +285,7 @@ Feature: provisioning | comments | | dav | | federatedfilesharing | + | federation | | files | | files_sharing | | files_trashbin | diff --git a/config/config.sample.php b/config/config.sample.php index 1a6c8b31280..18ac59f6cc9 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -414,6 +414,12 @@ $CONFIG = array( /** + * File versions + * + * These parameters control the Versions app. + */ + +/** * If the versions app is enabled (default), this setting defines the policy * for when versions will be permanently deleted. * The app allows for two settings, a minimum time for version retention, @@ -1104,7 +1110,7 @@ $CONFIG = array( 'filesystem_check_changes' => 0, /** - * On default ownCloud will store the part files created during upload in the + * By default ownCloud will store the part files created during upload in the * same storage as the upload target. Setting this to false will store the part * files in the root of the users folder which might be required to work with certain * external storage setups that have limited rename capabilities. diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index 885a1eefec4..8f6b219024c 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -194,6 +194,7 @@ OC.L10N.register( "sunny" : "slunečno", "Hello {name}, the weather is {weather}" : "Ahoj {name}, je {weather}", "Hello {name}" : "Vítej, {name}", + "new" : "nový", "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Probíhá aktualizace, opuštění této stránky může v některých prostředích přerušit proces.", "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index 187ebcc2802..b906ee16796 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -192,6 +192,7 @@ "sunny" : "slunečno", "Hello {name}, the weather is {weather}" : "Ahoj {name}, je {weather}", "Hello {name}" : "Vítej, {name}", + "new" : "nový", "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Probíhá aktualizace, opuštění této stránky může v některých prostředích přerušit proces.", "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.", diff --git a/core/l10n/de.js b/core/l10n/de.js index 52f88b36734..91cabc1dc2f 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -197,6 +197,7 @@ OC.L10N.register( "sunny" : "sonnig", "Hello {name}, the weather is {weather}" : "Hallo {name}, das Wetter ist {weather}", "Hello {name}" : "Hallo {name}", + "new" : "neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Update läuft gerade. Das Verlassen dieser Seite könnte den Update Prozess in einigen Umgebungen unterbrechen.", "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.", diff --git a/core/l10n/de.json b/core/l10n/de.json index 5f8b163c678..32404248e19 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -195,6 +195,7 @@ "sunny" : "sonnig", "Hello {name}, the weather is {weather}" : "Hallo {name}, das Wetter ist {weather}", "Hello {name}" : "Hallo {name}", + "new" : "neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Update läuft gerade. Das Verlassen dieser Seite könnte den Update Prozess in einigen Umgebungen unterbrechen.", "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 15a7b0a6035..2d6a1251fef 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -86,6 +86,7 @@ OC.L10N.register( "Oct." : "Okt.", "Nov." : "Nov.", "Dec." : "Dez.", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Information...</a>", "Settings" : "Einstellungen", "Saving..." : "Speichervorgang…", "Dismiss" : "Ausblenden", @@ -118,11 +119,18 @@ OC.L10N.register( "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Dein Webserver ist nicht richtig konfiguriert um \"{url}\" aufzulösen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Es wurde kein Memory Cache konfiguriert. Um die Leistung zu verbessern, konfigurieren Sie bitte einen Cache-Speicher, sofern vorhanden. Weitere Informationen finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ihre PHP Version ({version}) wird nicht länger <a href=\"{phpLink}\">unterstützt</a>. Wir empfehlen ein Upgrade ihrer PHP Version, um die volle Performance und Sicherheit zu gewährleisten.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Die Einstellung der Reverse Proxy Kopfzeile is falsch oder Sie greifen über einen gesicherten Proxy auf ownCloud zu. Falls Sie nicht über einen gesicherten Proxy auf ownCloud zugreifen handelt es sich um eine Sicherheitslücke, die es Angreifern erlaubt ihre IP-Adresse ownCloud gegenüber als sichtbar darzustellen. Weitere Informationen hierzu finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcache ist als verteilter Cache konfiguriert, aber das falsche PHP Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nud \"memcached\" und nicht \"memcache\". Siehe <a target=\"_blank\" href=\"{wikiLink}\">memcached Wiki über beide Module</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu behen finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)", "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für mehr Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sie greifen auf diese Site über HTTP zu. Wir raten dringend dazu, Ihren Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.", "Shared" : "Geteilt", "Shared with {recipients}" : "Geteilt mit {recipients}", @@ -157,14 +165,21 @@ OC.L10N.register( "change" : "Ändern", "delete" : "löschen", "access control" : "Zugriffskontrolle", + "Could not unshare" : "Freigabe konnte nicht aufgehoben werden", + "Share details could not be loaded for this item." : "Die Freigabedetails konnten für dieses Element nicht geladen werden.", "No users or groups found for {search}" : "Keine Benutzer oder Gruppen für {search} gefunden", "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", + "{sharee} (group)" : "{sharee} (Gruppe)", + "{sharee} (at {server})" : "{sharee} (über {server})", + "{sharee} (remote)" : "{sharee} (entfernt)", "Share" : "Teilen", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen", "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…", "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…", + "Error removing share" : "Fehler beim Entfernen der Freigabe", "Warning" : "Warnung", "Error while sending notification" : "Fehler beim Senden der Benachrichtigung", + "Non-existing tag #{tag}" : "Nicht existierender Tag #{tag}", "not assignable" : "nicht zuweisbar", "invisible" : "unsichtbar", "({scope})" : "({scope})", @@ -182,11 +197,13 @@ OC.L10N.register( "sunny" : "Sonnig", "Hello {name}, the weather is {weather}" : "Hallo {name}, das Wetter ist {weather}", "Hello {name}" : "Hallo {name}", + "new" : "Neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Upgrade läuft noch , diese Seite zu verlassen könnte das Verfahren in einigen Umgebungen unterbrechen.", "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.", "An error occurred." : "Ein Fehler ist aufgetreten.", "Please reload the page." : "Bitte laden Sie die Seite neu.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für mehr Informationen <a href=\"{url}\">lesen Sie unseren Forenbeitrag</a> zu diesem Thema.", "The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.", "The update was successful. There were warnings." : "Das Update war erfolgreich. Warnungen wurden ausgegeben.", "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", @@ -271,6 +288,7 @@ OC.L10N.register( "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.", "Thank you for your patience." : "Vielen Dank für Ihre Geduld.", "You are accessing the server from an untrusted domain." : "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie Administrator dieser Instanz sind, konfigurieren Sie bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Ihre Konfiguration zulässt, können Sie als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.", "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen", "App update required" : "App-Update notwendig", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 6fc700754e9..c8fa782cd68 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -84,6 +84,7 @@ "Oct." : "Okt.", "Nov." : "Nov.", "Dec." : "Dez.", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Information...</a>", "Settings" : "Einstellungen", "Saving..." : "Speichervorgang…", "Dismiss" : "Ausblenden", @@ -116,11 +117,18 @@ "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Dein Webserver ist nicht richtig konfiguriert um \"{url}\" aufzulösen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Es wurde kein Memory Cache konfiguriert. Um die Leistung zu verbessern, konfigurieren Sie bitte einen Cache-Speicher, sofern vorhanden. Weitere Informationen finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ihre PHP Version ({version}) wird nicht länger <a href=\"{phpLink}\">unterstützt</a>. Wir empfehlen ein Upgrade ihrer PHP Version, um die volle Performance und Sicherheit zu gewährleisten.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Die Einstellung der Reverse Proxy Kopfzeile is falsch oder Sie greifen über einen gesicherten Proxy auf ownCloud zu. Falls Sie nicht über einen gesicherten Proxy auf ownCloud zugreifen handelt es sich um eine Sicherheitslücke, die es Angreifern erlaubt ihre IP-Adresse ownCloud gegenüber als sichtbar darzustellen. Weitere Informationen hierzu finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcache ist als verteilter Cache konfiguriert, aber das falsche PHP Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nud \"memcached\" und nicht \"memcache\". Siehe <a target=\"_blank\" href=\"{wikiLink}\">memcached Wiki über beide Module</a>.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu behen finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)", "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für mehr Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sie greifen auf diese Site über HTTP zu. Wir raten dringend dazu, Ihren Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.", "Shared" : "Geteilt", "Shared with {recipients}" : "Geteilt mit {recipients}", @@ -155,14 +163,21 @@ "change" : "Ändern", "delete" : "löschen", "access control" : "Zugriffskontrolle", + "Could not unshare" : "Freigabe konnte nicht aufgehoben werden", + "Share details could not be loaded for this item." : "Die Freigabedetails konnten für dieses Element nicht geladen werden.", "No users or groups found for {search}" : "Keine Benutzer oder Gruppen für {search} gefunden", "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", + "{sharee} (group)" : "{sharee} (Gruppe)", + "{sharee} (at {server})" : "{sharee} (über {server})", + "{sharee} (remote)" : "{sharee} (entfernt)", "Share" : "Teilen", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen", "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…", "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…", + "Error removing share" : "Fehler beim Entfernen der Freigabe", "Warning" : "Warnung", "Error while sending notification" : "Fehler beim Senden der Benachrichtigung", + "Non-existing tag #{tag}" : "Nicht existierender Tag #{tag}", "not assignable" : "nicht zuweisbar", "invisible" : "unsichtbar", "({scope})" : "({scope})", @@ -180,11 +195,13 @@ "sunny" : "Sonnig", "Hello {name}, the weather is {weather}" : "Hallo {name}, das Wetter ist {weather}", "Hello {name}" : "Hallo {name}", + "new" : "Neu", "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Upgrade läuft noch , diese Seite zu verlassen könnte das Verfahren in einigen Umgebungen unterbrechen.", "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.", "An error occurred." : "Ein Fehler ist aufgetreten.", "Please reload the page." : "Bitte laden Sie die Seite neu.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Das Update war nicht erfolgreich. Für mehr Informationen <a href=\"{url}\">lesen Sie unseren Forenbeitrag</a> zu diesem Thema.", "The update was unsuccessful. " : "Die Aktualisierung war nicht erfolgreich.", "The update was successful. There were warnings." : "Das Update war erfolgreich. Warnungen wurden ausgegeben.", "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", @@ -269,6 +286,7 @@ "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.", "Thank you for your patience." : "Vielen Dank für Ihre Geduld.", "You are accessing the server from an untrusted domain." : "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie Administrator dieser Instanz sind, konfigurieren Sie bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Ihre Konfiguration zulässt, können Sie als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.", "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen", "App update required" : "App-Update notwendig", diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js index ec991bf4187..1221264295b 100644 --- a/core/l10n/en_GB.js +++ b/core/l10n/en_GB.js @@ -197,6 +197,7 @@ OC.L10N.register( "sunny" : "sunny", "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}", "Hello {name}" : "Hello {name}", + "new" : "new", "_download %n file_::_download %n files_" : ["download %n file","download %n files"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "The upgrade is in progress, leaving this page might interrupt the process in some environments.", "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.", diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json index 44c88fae998..31c6bb84927 100644 --- a/core/l10n/en_GB.json +++ b/core/l10n/en_GB.json @@ -195,6 +195,7 @@ "sunny" : "sunny", "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}", "Hello {name}" : "Hello {name}", + "new" : "new", "_download %n file_::_download %n files_" : ["download %n file","download %n files"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "The upgrade is in progress, leaving this page might interrupt the process in some environments.", "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index c6550a1733c..ee274733c58 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -197,6 +197,7 @@ OC.L10N.register( "sunny" : "aurinkoinen", "Hello {name}, the weather is {weather}" : "Hei {name}, sää on {weather}", "Hello {name}" : "Hei {name}", + "new" : "uusi", "_download %n file_::_download %n files_" : ["lataa %n tiedosto","lataa %n tiedostoa"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Päivitys on meneillään. Poistuminen tältä sivulta saattaa keskeyttää toimenpiteen joissain käyttöympäristöissä.", "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.", diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index 58f2edb8402..1845167f2f9 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -195,6 +195,7 @@ "sunny" : "aurinkoinen", "Hello {name}, the weather is {weather}" : "Hei {name}, sää on {weather}", "Hello {name}" : "Hei {name}", + "new" : "uusi", "_download %n file_::_download %n files_" : ["lataa %n tiedosto","lataa %n tiedostoa"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Päivitys on meneillään. Poistuminen tältä sivulta saattaa keskeyttää toimenpiteen joissain käyttöympäristöissä.", "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.", diff --git a/core/l10n/fil.js b/core/l10n/fil.js index 572404948ed..2970f46e122 100644 --- a/core/l10n/fil.js +++ b/core/l10n/fil.js @@ -1,8 +1,8 @@ OC.L10N.register( "core", { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "_download %n file_::_download %n files_" : ["",""], - "_{count} search result in other places_::_{count} search results in other places_" : ["",""] + "Error" : "Error", + "Password" : "Password", + "Username" : "Username" }, "nplurals=2; plural=(n > 1);"); diff --git a/core/l10n/fil.json b/core/l10n/fil.json index b43ffe08ed3..52803b95af4 100644 --- a/core/l10n/fil.json +++ b/core/l10n/fil.json @@ -1,6 +1,6 @@ { "translations": { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "_download %n file_::_download %n files_" : ["",""], - "_{count} search result in other places_::_{count} search results in other places_" : ["",""] + "Error" : "Error", + "Password" : "Password", + "Username" : "Username" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 15ff13d1b1d..0067bbbeecd 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -130,6 +130,7 @@ OC.L10N.register( "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.", "Shared" : "Partagé", "Shared with {recipients}" : "Partagé avec {recipients}", @@ -184,6 +185,7 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Supprimer", "Rename" : "Renommer", + "Collaborative tags" : "Étiquettes collaboratives ", "The object type is not specified." : "Le type d'objet n'est pas spécifié.", "Enter new" : "Saisir un nouveau", "Add" : "Ajouter", @@ -195,6 +197,7 @@ OC.L10N.register( "sunny" : "ensoleillé", "Hello {name}, the weather is {weather}" : "Bonjour {name}, le temps est {weather}", "Hello {name}" : "Hello {name}", + "new" : "Nouveau ", "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mise à jour est en cours. Selon la configuration, le fait de quitter cette page peut entraîner l'interruption de la procédure.", "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 55d603f9b9f..fd3e875fcb8 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -128,6 +128,7 @@ "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.", "Shared" : "Partagé", "Shared with {recipients}" : "Partagé avec {recipients}", @@ -182,6 +183,7 @@ "({scope})" : "({scope})", "Delete" : "Supprimer", "Rename" : "Renommer", + "Collaborative tags" : "Étiquettes collaboratives ", "The object type is not specified." : "Le type d'objet n'est pas spécifié.", "Enter new" : "Saisir un nouveau", "Add" : "Ajouter", @@ -193,6 +195,7 @@ "sunny" : "ensoleillé", "Hello {name}, the weather is {weather}" : "Bonjour {name}, le temps est {weather}", "Hello {name}" : "Hello {name}", + "new" : "Nouveau ", "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mise à jour est en cours. Selon la configuration, le fait de quitter cette page peut entraîner l'interruption de la procédure.", "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.", diff --git a/core/l10n/he.js b/core/l10n/he.js index 9a4dca6db4b..61846d6172f 100644 --- a/core/l10n/he.js +++ b/core/l10n/he.js @@ -197,6 +197,7 @@ OC.L10N.register( "sunny" : "שמשי", "Hello {name}, the weather is {weather}" : "שלום {name}, מזג האוויר הנו {weather}", "Hello {name}" : "שלום {name}", + "new" : "חדש", "_download %n file_::_download %n files_" : ["הורד %n קובץ","הורדו %n קבצים"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "מתבצע עכשיו שדרוג, מעבר מדף זה עלול לפגוע בתהליך בסביבות הפעלה מסויימות.", "Updating {productName} to version {version}, this may take a while." : "מעדכן {productName} לגרסה {version}, זה יקח זמן מה.", diff --git a/core/l10n/he.json b/core/l10n/he.json index 0cc3a80da20..6ae708f005b 100644 --- a/core/l10n/he.json +++ b/core/l10n/he.json @@ -195,6 +195,7 @@ "sunny" : "שמשי", "Hello {name}, the weather is {weather}" : "שלום {name}, מזג האוויר הנו {weather}", "Hello {name}" : "שלום {name}", + "new" : "חדש", "_download %n file_::_download %n files_" : ["הורד %n קובץ","הורדו %n קבצים"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "מתבצע עכשיו שדרוג, מעבר מדף זה עלול לפגוע בתהליך בסביבות הפעלה מסויימות.", "Updating {productName} to version {version}, this may take a while." : "מעדכן {productName} לגרסה {version}, זה יקח זמן מה.", diff --git a/core/l10n/hy.js b/core/l10n/hy.js index 1899f4d7eeb..2df8c53d3a2 100644 --- a/core/l10n/hy.js +++ b/core/l10n/hy.js @@ -15,6 +15,13 @@ OC.L10N.register( "Thu." : "Հնգ.", "Fri." : "Ուրբ.", "Sat." : "Շաբ.", + "Su" : "Կիր", + "Mo" : "Երկ", + "Tu" : "Երք", + "We" : "Չոր", + "Th" : "Հնգ", + "Fr" : "Ուրբ", + "Sa" : "Շաբ", "January" : "Հունվար", "February" : "Փետրվար", "March" : "Մարտ", @@ -42,24 +49,63 @@ OC.L10N.register( "seconds ago" : "վրկ. առաջ", "No" : "Ոչ", "Yes" : "Այո", + "Choose" : "Ընտրել", + "Ok" : "Լավ", + "New Files" : "Նոր ֆայլեր", "Cancel" : "Չեղարկել", + "Continue" : "Շարունակել", "Very weak password" : "Շատ թույլ գաղտնաբառ", "Weak password" : "Թույլ գաղտնաբառ", + "So-so password" : "Միջինոտ գաղտնաբառ", "Good password" : "Լավ գաղտնաբառ", + "Strong password" : "Ուժեղ գաղտնաբառ", + "Shared" : "Տարածած", + "Shared with {recipients}" : "Տարածած {recipients}ի հետ", "Error" : "Սխալ", + "Error while sharing" : "Սխալ տարածելիս", "Share link" : "Կիսվել հղմամբ", "Link" : "Հղում", "Password" : "Գաղտնաբառ", + "Allow editing" : "Թույլատրել խմբագրումը", + "Email link to person" : "Ուղարկել հղումը ոմնին", "Send" : "Ուղարկել", "group" : "խումբ", + "remote" : "հեռակա", + "can share" : "կարող է տարածել", + "can edit" : "կարող է խմբագրել", + "create" : "ստեղծել", + "change" : "փոխել", "delete" : "ջնջել", "Share" : "Կիսվել", "Warning" : "Զգուշացում", + "invisible" : "անտեսանելի", "Delete" : "Ջնջել", "Rename" : "Վերանվանել", "Add" : "Ավելացնել", + "Hello world!" : "Բա՛րև աշխարհ։", + "sunny" : "արևոտ", + "Hello {name}, the weather is {weather}" : "Բարև {name}, եղանակը {weather} է", + "Hello {name}" : "Բարև {name}", + "new" : "նոր", + "_download %n file_::_download %n files_" : ["ներբեռնել %n ֆայլ","ներբեռնել %n ֆայլ"], "Personal" : "Անձնական", + "Help" : "Օգնություն", + "File not found" : "Ֆայլը չգտնվեց", + "Type: %s" : "Տիպ. %s", + "Code: %s" : "Կոդ. %s", + "Message: %s" : "Նամակ. %s", + "File: %s" : "Ֆայլ. %s", + "Line: %s" : "Տող. %s", + "Trace" : "Հետք", + "Security warning" : "Անվտանգության զգուշացում", "Username" : "Օգտանուն", - "New password" : "Նոր գաղտնաբառ" + "Data folder" : "Տվյալների պանակ", + "Only %s is available." : "Միայն %sն է հասանելի։", + "Log out" : "Դուրս գալ", + "Search" : "Փնտրել", + "Log in" : "Մուտք գործել", + "Wrong password." : "Սխալ գաղտնաբառ։", + "New password" : "Նոր գաղտնաբառ", + "New Password" : "Նոր գաղտնաբառ" }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/hy.json b/core/l10n/hy.json index 23d99811203..0ea6cc509d5 100644 --- a/core/l10n/hy.json +++ b/core/l10n/hy.json @@ -13,6 +13,13 @@ "Thu." : "Հնգ.", "Fri." : "Ուրբ.", "Sat." : "Շաբ.", + "Su" : "Կիր", + "Mo" : "Երկ", + "Tu" : "Երք", + "We" : "Չոր", + "Th" : "Հնգ", + "Fr" : "Ուրբ", + "Sa" : "Շաբ", "January" : "Հունվար", "February" : "Փետրվար", "March" : "Մարտ", @@ -40,24 +47,63 @@ "seconds ago" : "վրկ. առաջ", "No" : "Ոչ", "Yes" : "Այո", + "Choose" : "Ընտրել", + "Ok" : "Լավ", + "New Files" : "Նոր ֆայլեր", "Cancel" : "Չեղարկել", + "Continue" : "Շարունակել", "Very weak password" : "Շատ թույլ գաղտնաբառ", "Weak password" : "Թույլ գաղտնաբառ", + "So-so password" : "Միջինոտ գաղտնաբառ", "Good password" : "Լավ գաղտնաբառ", + "Strong password" : "Ուժեղ գաղտնաբառ", + "Shared" : "Տարածած", + "Shared with {recipients}" : "Տարածած {recipients}ի հետ", "Error" : "Սխալ", + "Error while sharing" : "Սխալ տարածելիս", "Share link" : "Կիսվել հղմամբ", "Link" : "Հղում", "Password" : "Գաղտնաբառ", + "Allow editing" : "Թույլատրել խմբագրումը", + "Email link to person" : "Ուղարկել հղումը ոմնին", "Send" : "Ուղարկել", "group" : "խումբ", + "remote" : "հեռակա", + "can share" : "կարող է տարածել", + "can edit" : "կարող է խմբագրել", + "create" : "ստեղծել", + "change" : "փոխել", "delete" : "ջնջել", "Share" : "Կիսվել", "Warning" : "Զգուշացում", + "invisible" : "անտեսանելի", "Delete" : "Ջնջել", "Rename" : "Վերանվանել", "Add" : "Ավելացնել", + "Hello world!" : "Բա՛րև աշխարհ։", + "sunny" : "արևոտ", + "Hello {name}, the weather is {weather}" : "Բարև {name}, եղանակը {weather} է", + "Hello {name}" : "Բարև {name}", + "new" : "նոր", + "_download %n file_::_download %n files_" : ["ներբեռնել %n ֆայլ","ներբեռնել %n ֆայլ"], "Personal" : "Անձնական", + "Help" : "Օգնություն", + "File not found" : "Ֆայլը չգտնվեց", + "Type: %s" : "Տիպ. %s", + "Code: %s" : "Կոդ. %s", + "Message: %s" : "Նամակ. %s", + "File: %s" : "Ֆայլ. %s", + "Line: %s" : "Տող. %s", + "Trace" : "Հետք", + "Security warning" : "Անվտանգության զգուշացում", "Username" : "Օգտանուն", - "New password" : "Նոր գաղտնաբառ" + "Data folder" : "Տվյալների պանակ", + "Only %s is available." : "Միայն %sն է հասանելի։", + "Log out" : "Դուրս գալ", + "Search" : "Փնտրել", + "Log in" : "Մուտք գործել", + "Wrong password." : "Սխալ գաղտնաբառ։", + "New password" : "Նոր գաղտնաբառ", + "New Password" : "Նոր գաղտնաբառ" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/core/l10n/it.js b/core/l10n/it.js index c5abb478002..d2aa71ade8b 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -197,6 +197,7 @@ OC.L10N.register( "sunny" : "soleggiato", "Hello {name}, the weather is {weather}" : "Ciao {name}, il tempo è {weather}", "Hello {name}" : "Ciao {name}", + "new" : "nuovo", "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "L'aggiornamento è in corso, l'abbandono di questa pagina potrebbe interrompere il processo in alcuni ambienti.", "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.", diff --git a/core/l10n/it.json b/core/l10n/it.json index a8a463449c9..90caceb76d0 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -195,6 +195,7 @@ "sunny" : "soleggiato", "Hello {name}, the weather is {weather}" : "Ciao {name}, il tempo è {weather}", "Hello {name}" : "Ciao {name}", + "new" : "nuovo", "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "L'aggiornamento è in corso, l'abbandono di questa pagina potrebbe interrompere il processo in alcuni ambienti.", "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.", diff --git a/core/l10n/ko.js b/core/l10n/ko.js index ff71d0fbefe..2b4c6f1d1d9 100644 --- a/core/l10n/ko.js +++ b/core/l10n/ko.js @@ -16,10 +16,15 @@ OC.L10N.register( "Updated \"%s\" to %s" : "\"%s\"을(를) %s(으)로 업데이트함", "Repair warning: " : "수리 경고:", "Repair error: " : "수리 오류:", + "Set log level to debug" : "로그 단계를 디버그로 설정", + "Reset log level" : "로그 단계 초기화", + "Starting code integrity check" : "코드 무결성 검사 시작 중", + "Finished code integrity check" : "코드 무결성 검사 완료됨", "%s (3rdparty)" : "%s(제 3사)", "%s (incompatible)" : "%s(호환 불가)", "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s", "Already up to date" : "최신 상태임", + "Please select a file." : "파일을 선택하십시오.", "File is too big" : "파일이 너무 큼", "Invalid file provided" : "잘못된 파일 지정됨", "No image or file provided" : "사진이나 파일이 없음", @@ -33,6 +38,7 @@ OC.L10N.register( "Couldn't reset password because the token is invalid" : "토큰이 잘못되었기 때문에 암호를 초기화할 수 없습니다", "Couldn't reset password because the token is expired" : "토큰이 만료되어 암호를 초기화할 수 없습니다", "Couldn't send reset email. Please make sure your username is correct." : "재설정 메일을 보낼 수 없습니다. 사용자 이름이 올바른지 확인하십시오.", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "이 사용자 이름과 연결된 이메일 주소가 없어서 초기화 메일을 보낼 수 없습니다. 시스템 관리자에게 연락하십시오.", "%s password reset" : "%s 암호 재설정", "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.", "Sunday" : "일요일", @@ -80,6 +86,7 @@ OC.L10N.register( "Oct." : "10월", "Nov." : "11월", "Dec." : "12월", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">코드 무결성 검사 중 오류가 발생했습니다. 더 많은 정보를 보려면 누르십시오…</a>", "Settings" : "설정", "Saving..." : "저장 중...", "Dismiss" : "닫기", @@ -112,10 +119,18 @@ OC.L10N.register( "Good password" : "좋은 암호", "Strong password" : "강력한 암호", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "WebDAV 서비스가 올바르게 작동하지 않아서 웹 서버에서 파일 동기화를 사용할 수 없습니다.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "웹 서버에서 \"{url}\"을(를) 올바르게 처리할 수 없습니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참고하십시오.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "서버에서 인터넷 연결을 사용할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 기능을 사용할 수 없습니다. 원격에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "메모리 캐시를 설정하지 않았습니다. 성능 향상을 위해서 사용 가능한 경우 memcache를 설정하십시오. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참고하십시오.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "PHP에서 /dev/urandom에 접근할 수 없으며, 보안상의 이유로 권장하지 않습니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참고하십시오.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "PHP 버전 {{version}}은(는) 더 이상 <a target=\"_blank\" href=\"{phpLink}\">PHP에서 지원하지 않습니다</a>. PHP를 업그레이드하면 성능 향상 및 보안성 개선이 가능합니다.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더가 잘못 설정되었거나, ownCloud를 신뢰할 수 있는 프록시에서 접근하고 있습니다. 신뢰할 수 있는 프록시에서 ownCloud에 접근하고 있는 경우가 아니라면, 보안 문제가 발생하여 공격자가 ownCloud에 접근하는 IP를 속일 수 있습니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참고하십시오.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached가 분산형 캐시로 설정되어 있으나, 잘못된 PHP 모듈 \"memcache\"가 설치되어 있습니다. \\OC\\Memcache\\Memcached는 \"memcached\" 모듈에서만 지원하며, \"memcache\" 모듈은 해당하지 않습니다. <a target=\"_blank\" href=\"{wikiLink}\">memcached 위키의 모듈 정보</a>를 참고하십시오.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "일부 파일이 무결성 검사를 통과하지 못했습니다. 이 문제를 해결하는 방법은 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참조하십시오.(<a href=\"{codeIntegrityDownloadEndpoint}\">잘못된 파일 목록…</a> / <a href=\"{rescanEndpoint}\">다시 검사…</a>)", "Error occurred while checking server setup" : "서버 설정을 확인하는 중 오류 발생", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "인터넷에서 데이터 디렉터리와 파일에 접근할 수 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 직접 접근할 수 없도록 하거나, 데이터 디렉터리를 웹 서버 문서 경로 바깥에 두십시오.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 헤더가 \"{expected}\"와(과) 같이 설정되지 않았습니다. 잠재적인 보안 위협이 될 수 있으므로 설정을 변경하는 것을 추천합니다.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP 헤더가 최소 \"{seconds}\"초 이상으로 설정되어 있지 않습니다. 보안 강화를 위해서 <a href=\"{docUrl}\">보안 팁</a>에 따라 HSTS를 설정하는 것을 추천합니다.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "이 사이트를 HTTP로 접근하고 있습니다. <a href=\"{docUrl}\">보안 팁</a>에 나타난 것처럼 서버 설정을 변경하여 HTTPS를 사용하는 것을 강력히 추천합니다.", "Shared" : "공유됨", "Shared with {recipients}" : "{recipients} 님과 공유됨", @@ -150,16 +165,27 @@ OC.L10N.register( "change" : "변경", "delete" : "삭제", "access control" : "접근 제어", + "Could not unshare" : "공유 해제할 수 없음", "Share details could not be loaded for this item." : "이 항목의 공유 정보를 불러올 수 없습니다.", + "No users or groups found for {search}" : "{search}에 해당하는 사용자나 그룹을 찾을 수 없음", "An error occured. Please try again" : "오류가 발생했습니다. 다시 시도하십시오.", + "{sharee} (group)" : "{sharee}(그룹)", + "{sharee} (at {server})" : "{sharee}({server}에 있음)", + "{sharee} (remote)" : "{sharee}(원격)", "Share" : "공유", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다", "Share with users or groups …" : "사용자 및 그룹과 공유...", "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...", + "Error removing share" : "공유 삭제 중 오류 발생", "Warning" : "경고", "Error while sending notification" : "알림을 보내는 중 오류 발생", + "Non-existing tag #{tag}" : "존재하지 않는 태그 #{tag}", + "not assignable" : "할당할 수 없음", + "invisible" : "보이지 않음", + "({scope})" : "({scope})", "Delete" : "삭제", "Rename" : "이름 바꾸기", + "Collaborative tags" : "협동 태그", "The object type is not specified." : "객체 유형이 지정되지 않았습니다.", "Enter new" : "새로운 값 입력", "Add" : "추가", @@ -171,11 +197,13 @@ OC.L10N.register( "sunny" : "맑음", "Hello {name}, the weather is {weather}" : "{name} 님 안녕하세요, 오늘 날씨는 {weather}입니다", "Hello {name}" : "{name} 님 안녕하세요", + "new" : "새로운 항목", "_download %n file_::_download %n files_" : ["파일 %n개 다운로드"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "업그레이드 중입니다. 이 페이지를 열어 두면 일부 환경에서 진행 과정을 중단시킬 수 있습니다.", "Updating {productName} to version {version}, this may take a while." : "{productName}을(를) 버전 {version}으로 업데이트하고 있습니다. 시간이 걸릴 수 있습니다.", "An error occurred." : "오류가 발생했습니다.", "Please reload the page." : "페이지를 새로 고치십시오.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "업데이트에 실패했습니다. 더 많은 정보를 보려면 이 문제를 다루은 <a href=\"{url}\">포럼 글</a>을 참조하십시오.", "The update was unsuccessful. " : "업데이트가 실패했습니다. ", "The update was successful. There were warnings." : "업데이트가 성공했습니다. 일부 경고가 있습니다.", "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공했습니다. ownCloud로 돌아갑니다.", @@ -248,6 +276,7 @@ OC.L10N.register( "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.", "Log in" : "로그인", "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?", + "Wrong password." : "암호가 잘못되었습니다.", "Stay logged in" : "로그인 유지", "Alternative Logins" : "대체 로그인", "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}", @@ -259,6 +288,7 @@ OC.L10N.register( "Contact your system administrator if this message persists or appeared unexpectedly." : "이 메시지가 계속 표시되거나, 예상하지 못하였을 때 표시된다면 시스템 관리자에게 연락하십시오", "Thank you for your patience." : "기다려 주셔서 감사합니다.", "You are accessing the server from an untrusted domain." : "신뢰할 수 없는 도메인으로 서버에 접근하고 있습니다.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "시스템 관리자에게 연락하십시오. 만약 이 인스턴스의 관리자라면 config/config.php에서 \"trusted_domains\" 설정을 편집하십시오. config/config.sample.php에 있는 예제 설정을 참고하십시오.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "설정에 따라서 관리자 권한으로 아래 단추를 눌러서 이 도메인을 신뢰하도록 설정할 수 있습니다.", "Add \"%s\" as trusted domain" : "\"%s\"을(를) 신뢰할 수 있는 도메인으로 추가", "App update required" : "앱 업데이트 필요", diff --git a/core/l10n/ko.json b/core/l10n/ko.json index f1f2dd6796b..a5dc1824c63 100644 --- a/core/l10n/ko.json +++ b/core/l10n/ko.json @@ -14,10 +14,15 @@ "Updated \"%s\" to %s" : "\"%s\"을(를) %s(으)로 업데이트함", "Repair warning: " : "수리 경고:", "Repair error: " : "수리 오류:", + "Set log level to debug" : "로그 단계를 디버그로 설정", + "Reset log level" : "로그 단계 초기화", + "Starting code integrity check" : "코드 무결성 검사 시작 중", + "Finished code integrity check" : "코드 무결성 검사 완료됨", "%s (3rdparty)" : "%s(제 3사)", "%s (incompatible)" : "%s(호환 불가)", "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s", "Already up to date" : "최신 상태임", + "Please select a file." : "파일을 선택하십시오.", "File is too big" : "파일이 너무 큼", "Invalid file provided" : "잘못된 파일 지정됨", "No image or file provided" : "사진이나 파일이 없음", @@ -31,6 +36,7 @@ "Couldn't reset password because the token is invalid" : "토큰이 잘못되었기 때문에 암호를 초기화할 수 없습니다", "Couldn't reset password because the token is expired" : "토큰이 만료되어 암호를 초기화할 수 없습니다", "Couldn't send reset email. Please make sure your username is correct." : "재설정 메일을 보낼 수 없습니다. 사용자 이름이 올바른지 확인하십시오.", + "Could not send reset email because there is no email address for this username. Please contact your administrator." : "이 사용자 이름과 연결된 이메일 주소가 없어서 초기화 메일을 보낼 수 없습니다. 시스템 관리자에게 연락하십시오.", "%s password reset" : "%s 암호 재설정", "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.", "Sunday" : "일요일", @@ -78,6 +84,7 @@ "Oct." : "10월", "Nov." : "11월", "Dec." : "12월", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">코드 무결성 검사 중 오류가 발생했습니다. 더 많은 정보를 보려면 누르십시오…</a>", "Settings" : "설정", "Saving..." : "저장 중...", "Dismiss" : "닫기", @@ -110,10 +117,18 @@ "Good password" : "좋은 암호", "Strong password" : "강력한 암호", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "WebDAV 서비스가 올바르게 작동하지 않아서 웹 서버에서 파일 동기화를 사용할 수 없습니다.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "웹 서버에서 \"{url}\"을(를) 올바르게 처리할 수 없습니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참고하십시오.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "서버에서 인터넷 연결을 사용할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 기능을 사용할 수 없습니다. 원격에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "메모리 캐시를 설정하지 않았습니다. 성능 향상을 위해서 사용 가능한 경우 memcache를 설정하십시오. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참고하십시오.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "PHP에서 /dev/urandom에 접근할 수 없으며, 보안상의 이유로 권장하지 않습니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참고하십시오.", + "Your PHP version ({version}) is no longer <a target=\"_blank\" href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "PHP 버전 {{version}}은(는) 더 이상 <a target=\"_blank\" href=\"{phpLink}\">PHP에서 지원하지 않습니다</a>. PHP를 업그레이드하면 성능 향상 및 보안성 개선이 가능합니다.", + "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더가 잘못 설정되었거나, ownCloud를 신뢰할 수 있는 프록시에서 접근하고 있습니다. 신뢰할 수 있는 프록시에서 ownCloud에 접근하고 있는 경우가 아니라면, 보안 문제가 발생하여 공격자가 ownCloud에 접근하는 IP를 속일 수 있습니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참고하십시오.", + "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached가 분산형 캐시로 설정되어 있으나, 잘못된 PHP 모듈 \"memcache\"가 설치되어 있습니다. \\OC\\Memcache\\Memcached는 \"memcached\" 모듈에서만 지원하며, \"memcache\" 모듈은 해당하지 않습니다. <a target=\"_blank\" href=\"{wikiLink}\">memcached 위키의 모듈 정보</a>를 참고하십시오.", + "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "일부 파일이 무결성 검사를 통과하지 못했습니다. 이 문제를 해결하는 방법은 <a target=\"_blank\" href=\"{docLink}\">문서</a>를 참조하십시오.(<a href=\"{codeIntegrityDownloadEndpoint}\">잘못된 파일 목록…</a> / <a href=\"{rescanEndpoint}\">다시 검사…</a>)", "Error occurred while checking server setup" : "서버 설정을 확인하는 중 오류 발생", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "인터넷에서 데이터 디렉터리와 파일에 접근할 수 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 직접 접근할 수 없도록 하거나, 데이터 디렉터리를 웹 서버 문서 경로 바깥에 두십시오.", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 헤더가 \"{expected}\"와(과) 같이 설정되지 않았습니다. 잠재적인 보안 위협이 될 수 있으므로 설정을 변경하는 것을 추천합니다.", + "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP 헤더가 최소 \"{seconds}\"초 이상으로 설정되어 있지 않습니다. 보안 강화를 위해서 <a href=\"{docUrl}\">보안 팁</a>에 따라 HSTS를 설정하는 것을 추천합니다.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "이 사이트를 HTTP로 접근하고 있습니다. <a href=\"{docUrl}\">보안 팁</a>에 나타난 것처럼 서버 설정을 변경하여 HTTPS를 사용하는 것을 강력히 추천합니다.", "Shared" : "공유됨", "Shared with {recipients}" : "{recipients} 님과 공유됨", @@ -148,16 +163,27 @@ "change" : "변경", "delete" : "삭제", "access control" : "접근 제어", + "Could not unshare" : "공유 해제할 수 없음", "Share details could not be loaded for this item." : "이 항목의 공유 정보를 불러올 수 없습니다.", + "No users or groups found for {search}" : "{search}에 해당하는 사용자나 그룹을 찾을 수 없음", "An error occured. Please try again" : "오류가 발생했습니다. 다시 시도하십시오.", + "{sharee} (group)" : "{sharee}(그룹)", + "{sharee} (at {server})" : "{sharee}({server}에 있음)", + "{sharee} (remote)" : "{sharee}(원격)", "Share" : "공유", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다", "Share with users or groups …" : "사용자 및 그룹과 공유...", "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...", + "Error removing share" : "공유 삭제 중 오류 발생", "Warning" : "경고", "Error while sending notification" : "알림을 보내는 중 오류 발생", + "Non-existing tag #{tag}" : "존재하지 않는 태그 #{tag}", + "not assignable" : "할당할 수 없음", + "invisible" : "보이지 않음", + "({scope})" : "({scope})", "Delete" : "삭제", "Rename" : "이름 바꾸기", + "Collaborative tags" : "협동 태그", "The object type is not specified." : "객체 유형이 지정되지 않았습니다.", "Enter new" : "새로운 값 입력", "Add" : "추가", @@ -169,11 +195,13 @@ "sunny" : "맑음", "Hello {name}, the weather is {weather}" : "{name} 님 안녕하세요, 오늘 날씨는 {weather}입니다", "Hello {name}" : "{name} 님 안녕하세요", + "new" : "새로운 항목", "_download %n file_::_download %n files_" : ["파일 %n개 다운로드"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "업그레이드 중입니다. 이 페이지를 열어 두면 일부 환경에서 진행 과정을 중단시킬 수 있습니다.", "Updating {productName} to version {version}, this may take a while." : "{productName}을(를) 버전 {version}으로 업데이트하고 있습니다. 시간이 걸릴 수 있습니다.", "An error occurred." : "오류가 발생했습니다.", "Please reload the page." : "페이지를 새로 고치십시오.", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "업데이트에 실패했습니다. 더 많은 정보를 보려면 이 문제를 다루은 <a href=\"{url}\">포럼 글</a>을 참조하십시오.", "The update was unsuccessful. " : "업데이트가 실패했습니다. ", "The update was successful. There were warnings." : "업데이트가 성공했습니다. 일부 경고가 있습니다.", "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공했습니다. ownCloud로 돌아갑니다.", @@ -246,6 +274,7 @@ "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.", "Log in" : "로그인", "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?", + "Wrong password." : "암호가 잘못되었습니다.", "Stay logged in" : "로그인 유지", "Alternative Logins" : "대체 로그인", "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}", @@ -257,6 +286,7 @@ "Contact your system administrator if this message persists or appeared unexpectedly." : "이 메시지가 계속 표시되거나, 예상하지 못하였을 때 표시된다면 시스템 관리자에게 연락하십시오", "Thank you for your patience." : "기다려 주셔서 감사합니다.", "You are accessing the server from an untrusted domain." : "신뢰할 수 없는 도메인으로 서버에 접근하고 있습니다.", + "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "시스템 관리자에게 연락하십시오. 만약 이 인스턴스의 관리자라면 config/config.php에서 \"trusted_domains\" 설정을 편집하십시오. config/config.sample.php에 있는 예제 설정을 참고하십시오.", "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "설정에 따라서 관리자 권한으로 아래 단추를 눌러서 이 도메인을 신뢰하도록 설정할 수 있습니다.", "Add \"%s\" as trusted domain" : "\"%s\"을(를) 신뢰할 수 있는 도메인으로 추가", "App update required" : "앱 업데이트 필요", diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js index d4985dd9791..d1e15109d9a 100644 --- a/core/l10n/nb_NO.js +++ b/core/l10n/nb_NO.js @@ -197,6 +197,7 @@ OC.L10N.register( "sunny" : "solfylt", "Hello {name}, the weather is {weather}" : "Hallo {name}, været er {weather}", "Hello {name}" : "Hallo {name}", + "new" : "ny", "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "En oppdatering foregår, lukking av denne siden kan forstyrre prosessen for enkelte systemer.", "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.", diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json index 45624062b77..7b5281a14ae 100644 --- a/core/l10n/nb_NO.json +++ b/core/l10n/nb_NO.json @@ -195,6 +195,7 @@ "sunny" : "solfylt", "Hello {name}, the weather is {weather}" : "Hallo {name}, været er {weather}", "Hello {name}" : "Hallo {name}", + "new" : "ny", "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "En oppdatering foregår, lukking av denne siden kan forstyrre prosessen for enkelte systemer.", "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.", diff --git a/core/l10n/ne.js b/core/l10n/ne.js deleted file mode 100644 index 4cb36aaaaac..00000000000 --- a/core/l10n/ne.js +++ /dev/null @@ -1,8 +0,0 @@ -OC.L10N.register( - "core", - { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "_download %n file_::_download %n files_" : ["",""], - "_{count} search result in other places_::_{count} search results in other places_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/ne.json b/core/l10n/ne.json deleted file mode 100644 index 43fce52c5cf..00000000000 --- a/core/l10n/ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ "translations": { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "_download %n file_::_download %n files_" : ["",""], - "_{count} search result in other places_::_{count} search results in other places_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/core/l10n/nl.js b/core/l10n/nl.js index c96c087d5fd..dd185c79d76 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -118,7 +118,7 @@ OC.L10N.register( "So-so password" : "Matig wachtwoord", "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", - "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verstoord lijkt.", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface verstoord lijkt.", "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Uw webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.", @@ -185,6 +185,7 @@ OC.L10N.register( "({scope})" : "({scope})", "Delete" : "Verwijder", "Rename" : "Naam wijzigen", + "Collaborative tags" : "Meewerkende labels", "The object type is not specified." : "Het object type is niet gespecificeerd.", "Enter new" : "Opgeven nieuw", "Add" : "Toevoegen", @@ -196,6 +197,7 @@ OC.L10N.register( "sunny" : "zonnig", "Hello {name}, the weather is {weather}" : "Hallo {name}, het is hier {weather}", "Hello {name}" : "Hallo {name}", + "new" : "nieuw", "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "De update is bezig, deze pagina verlaten kan het updateproces in sommige omgevingen onderbreken.", "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.", @@ -241,7 +243,7 @@ OC.L10N.register( "Line: %s" : "Regel: %s", "Trace" : "Trace", "Security warning" : "Beveiligingswaarschuwing", - "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.", + "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet, omdat het .htaccess-bestand niet functioneert.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.", "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan", "Username" : "Gebruikersnaam", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index 056b0697602..a47222fee3d 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -116,7 +116,7 @@ "So-so password" : "Matig wachtwoord", "Good password" : "Goed wachtwoord", "Strong password" : "Sterk wachtwoord", - "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verstoord lijkt.", + "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface verstoord lijkt.", "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Uw webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.", @@ -183,6 +183,7 @@ "({scope})" : "({scope})", "Delete" : "Verwijder", "Rename" : "Naam wijzigen", + "Collaborative tags" : "Meewerkende labels", "The object type is not specified." : "Het object type is niet gespecificeerd.", "Enter new" : "Opgeven nieuw", "Add" : "Toevoegen", @@ -194,6 +195,7 @@ "sunny" : "zonnig", "Hello {name}, the weather is {weather}" : "Hallo {name}, het is hier {weather}", "Hello {name}" : "Hallo {name}", + "new" : "nieuw", "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "De update is bezig, deze pagina verlaten kan het updateproces in sommige omgevingen onderbreken.", "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.", @@ -239,7 +241,7 @@ "Line: %s" : "Regel: %s", "Trace" : "Trace", "Security warning" : "Beveiligingswaarschuwing", - "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.", + "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet, omdat het .htaccess-bestand niet functioneert.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.", "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan", "Username" : "Gebruikersnaam", diff --git a/core/l10n/or_IN.js b/core/l10n/or_IN.js deleted file mode 100644 index 4cb36aaaaac..00000000000 --- a/core/l10n/or_IN.js +++ /dev/null @@ -1,8 +0,0 @@ -OC.L10N.register( - "core", - { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "_download %n file_::_download %n files_" : ["",""], - "_{count} search result in other places_::_{count} search results in other places_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/or_IN.json b/core/l10n/or_IN.json deleted file mode 100644 index 43fce52c5cf..00000000000 --- a/core/l10n/or_IN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ "translations": { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "_download %n file_::_download %n files_" : ["",""], - "_{count} search result in other places_::_{count} search results in other places_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/core/l10n/pl.js b/core/l10n/pl.js index 9aeebb93935..0203ac579e6 100644 --- a/core/l10n/pl.js +++ b/core/l10n/pl.js @@ -123,8 +123,11 @@ OC.L10N.register( "change" : "zmiany", "delete" : "usuń", "access control" : "kontrola dostępu", + "An error occured. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.", "Share" : "Udostępnij", + "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Współdziel z użytkownikami innych chmur ownCloud używając wzorca uzytkownik@example.com/owncloud", "Share with users or groups …" : "Współdziel z użytkownikami lub grupami", + "Share with users, groups or remote users …" : "Współdziel z użytkownikami, grupami lub użytkownikami zdalnymi ...", "Warning" : "Ostrzeżenie", "Delete" : "Usuń", "Rename" : "Zmień nazwę", @@ -194,12 +197,16 @@ OC.L10N.register( "Finishing …" : "Kończę ...", "Need help?" : "Potrzebujesz pomocy?", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę {linkstart}włączyć JavaScript{linkend} i przeładować stronę.", "Log out" : "Wyloguj", "Search" : "Wyszukaj", "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!", "Please contact your administrator." : "Skontaktuj się z administratorem", "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.", "Log in" : "Zaloguj", + "Wrong password. Reset it?" : "Niepoprawne hasło? Zresetuj je!", + "Wrong password." : "Złe hasło", + "Stay logged in" : "Pozostań zalogowany", "Alternative Logins" : "Alternatywne loginy", "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}", "New password" : "Nowe hasło", diff --git a/core/l10n/pl.json b/core/l10n/pl.json index 848ef7ec1b5..d82bc2eca24 100644 --- a/core/l10n/pl.json +++ b/core/l10n/pl.json @@ -121,8 +121,11 @@ "change" : "zmiany", "delete" : "usuń", "access control" : "kontrola dostępu", + "An error occured. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.", "Share" : "Udostępnij", + "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Współdziel z użytkownikami innych chmur ownCloud używając wzorca uzytkownik@example.com/owncloud", "Share with users or groups …" : "Współdziel z użytkownikami lub grupami", + "Share with users, groups or remote users …" : "Współdziel z użytkownikami, grupami lub użytkownikami zdalnymi ...", "Warning" : "Ostrzeżenie", "Delete" : "Usuń", "Rename" : "Zmień nazwę", @@ -192,12 +195,16 @@ "Finishing …" : "Kończę ...", "Need help?" : "Potrzebujesz pomocy?", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę {linkstart}włączyć JavaScript{linkend} i przeładować stronę.", "Log out" : "Wyloguj", "Search" : "Wyszukaj", "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!", "Please contact your administrator." : "Skontaktuj się z administratorem", "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.", "Log in" : "Zaloguj", + "Wrong password. Reset it?" : "Niepoprawne hasło? Zresetuj je!", + "Wrong password." : "Złe hasło", + "Stay logged in" : "Pozostań zalogowany", "Alternative Logins" : "Alternatywne loginy", "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}", "New password" : "Nowe hasło", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index fc00b309591..9fe8589701a 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -197,6 +197,7 @@ OC.L10N.register( "sunny" : "ensolarado", "Hello {name}, the weather is {weather}" : "Olá {name}, o clima está {weather}", "Hello {name}" : "Olá {name}", + "new" : "novo", "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "A atualização está em andamento, deixando esta página pode haver interrupção do processo em alguns ambientes.", "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index 659da4f76cf..f31423f7ac5 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -195,6 +195,7 @@ "sunny" : "ensolarado", "Hello {name}, the weather is {weather}" : "Olá {name}, o clima está {weather}", "Hello {name}" : "Olá {name}", + "new" : "novo", "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "A atualização está em andamento, deixando esta página pode haver interrupção do processo em alguns ambientes.", "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.", diff --git a/core/l10n/sl.js b/core/l10n/sl.js index a86d7cdbe6f..3cb9f0762c6 100644 --- a/core/l10n/sl.js +++ b/core/l10n/sl.js @@ -8,7 +8,7 @@ OC.L10N.register( "Maintenance mode is kept active" : "Vzdrževalni način je še vedno dejaven", "Updating database schema" : "Poteka posodabljanje sheme podatkovne zbirke", "Updated database" : "Posodobljena podatkovna zbirka", - "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Preverjam, ali lahko posodobim strukturo baze (lahko traja dlje zaradi velikosti baze)", + "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Preverjam, ali lahko posodobim strukturo baze (zaradi velikosti lahko traja dlje časa)", "Checked database schema update" : "Izbrana posodobitev sheme podatkovne zbirke", "Checking updates of apps" : "Poteka preverjanje za posodobitve programov", "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Preverjam, ali lahko posodobim strukturo baze za %s (lahko traja dlje zaradi velikosti baze)", @@ -31,7 +31,7 @@ OC.L10N.register( "An error occurred. Please contact your admin." : "Prišlo je do napake. Stopite v stik s skrbnikom sistema.", "No temporary profile picture available, try again" : "Na voljo ni nobene začasne slike za profil. Poskusite znova.", "No crop data provided" : "Ni podanih podatkov obreza", - "No valid crop data provided" : "Napačni podatki za obrez slike", + "No valid crop data provided" : "Navedeni so neveljavni podatki obrez slike", "Crop is not square" : "Obrez ni pravokoten", "Couldn't reset password because the token is invalid" : "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.", "Couldn't reset password because the token is expired" : "Ni mogoče ponastaviti gesla, ker je žeton potekel.", @@ -148,12 +148,12 @@ OC.L10N.register( "change" : "sprememba", "delete" : "izbriše", "access control" : "nadzor dostopa", - "Share details could not be loaded for this item." : "Detajlov souporabe ne morem naložiti za ta element.", + "Share details could not be loaded for this item." : "Podrobnosti souporabe za te predmet ni mogoče naložiti.", "An error occured. Please try again" : "Prišlo je do napake. Poskusite znova.", "Share" : "Souporaba", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Soupraba z ljudmi v drugih ownCloud oblakih v formatu uporabnik@domena.si/owncloud", "Share with users or groups …" : "Souporaba z uporabniki ali skupinami ...", - "Share with users, groups or remote users …" : "Souporaba z usporabniki, skupinami ali zunanjimi uporabniki ...", + "Share with users, groups or remote users …" : "Souporaba z uporabniki, skupinami ali oddaljenimi uporabniki ...", "Warning" : "Opozorilo", "Error while sending notification" : "Napaka med pošiljanjem obvestila", "Delete" : "Izbriši", @@ -175,7 +175,7 @@ OC.L10N.register( "An error occurred." : "Prišlo je do napake.", "Please reload the page." : "Stran je treba ponovno naložiti", "The update was unsuccessful. " : "Posodobitev je spodletela.", - "The update was successful. There were warnings." : "Posodobitev je uspela. Z nekaj opozorili.", + "The update was successful. There were warnings." : "Posodobitev je uspešno končana, vendar z nekaj opozorili.", "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", "Searching other places" : "Iskanje drugih mest", "No search results in other folders" : "Iskanje po drugih mapah ni vrnilo rezultata", diff --git a/core/l10n/sl.json b/core/l10n/sl.json index cccdbee4f8b..1b184793888 100644 --- a/core/l10n/sl.json +++ b/core/l10n/sl.json @@ -6,7 +6,7 @@ "Maintenance mode is kept active" : "Vzdrževalni način je še vedno dejaven", "Updating database schema" : "Poteka posodabljanje sheme podatkovne zbirke", "Updated database" : "Posodobljena podatkovna zbirka", - "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Preverjam, ali lahko posodobim strukturo baze (lahko traja dlje zaradi velikosti baze)", + "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Preverjam, ali lahko posodobim strukturo baze (zaradi velikosti lahko traja dlje časa)", "Checked database schema update" : "Izbrana posodobitev sheme podatkovne zbirke", "Checking updates of apps" : "Poteka preverjanje za posodobitve programov", "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Preverjam, ali lahko posodobim strukturo baze za %s (lahko traja dlje zaradi velikosti baze)", @@ -29,7 +29,7 @@ "An error occurred. Please contact your admin." : "Prišlo je do napake. Stopite v stik s skrbnikom sistema.", "No temporary profile picture available, try again" : "Na voljo ni nobene začasne slike za profil. Poskusite znova.", "No crop data provided" : "Ni podanih podatkov obreza", - "No valid crop data provided" : "Napačni podatki za obrez slike", + "No valid crop data provided" : "Navedeni so neveljavni podatki obrez slike", "Crop is not square" : "Obrez ni pravokoten", "Couldn't reset password because the token is invalid" : "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.", "Couldn't reset password because the token is expired" : "Ni mogoče ponastaviti gesla, ker je žeton potekel.", @@ -146,12 +146,12 @@ "change" : "sprememba", "delete" : "izbriše", "access control" : "nadzor dostopa", - "Share details could not be loaded for this item." : "Detajlov souporabe ne morem naložiti za ta element.", + "Share details could not be loaded for this item." : "Podrobnosti souporabe za te predmet ni mogoče naložiti.", "An error occured. Please try again" : "Prišlo je do napake. Poskusite znova.", "Share" : "Souporaba", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Soupraba z ljudmi v drugih ownCloud oblakih v formatu uporabnik@domena.si/owncloud", "Share with users or groups …" : "Souporaba z uporabniki ali skupinami ...", - "Share with users, groups or remote users …" : "Souporaba z usporabniki, skupinami ali zunanjimi uporabniki ...", + "Share with users, groups or remote users …" : "Souporaba z uporabniki, skupinami ali oddaljenimi uporabniki ...", "Warning" : "Opozorilo", "Error while sending notification" : "Napaka med pošiljanjem obvestila", "Delete" : "Izbriši", @@ -173,7 +173,7 @@ "An error occurred." : "Prišlo je do napake.", "Please reload the page." : "Stran je treba ponovno naložiti", "The update was unsuccessful. " : "Posodobitev je spodletela.", - "The update was successful. There were warnings." : "Posodobitev je uspela. Z nekaj opozorili.", + "The update was successful. There were warnings." : "Posodobitev je uspešno končana, vendar z nekaj opozorili.", "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", "Searching other places" : "Iskanje drugih mest", "No search results in other folders" : "Iskanje po drugih mapah ni vrnilo rezultata", diff --git a/core/l10n/uz.js b/core/l10n/uz.js deleted file mode 100644 index 79b14074bf0..00000000000 --- a/core/l10n/uz.js +++ /dev/null @@ -1,8 +0,0 @@ -OC.L10N.register( - "core", - { - "_{count} file conflict_::_{count} file conflicts_" : [""], - "_download %n file_::_download %n files_" : [""], - "_{count} search result in other places_::_{count} search results in other places_" : [""] -}, -"nplurals=1; plural=0;"); diff --git a/core/l10n/uz.json b/core/l10n/uz.json deleted file mode 100644 index 2a362261184..00000000000 --- a/core/l10n/uz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ "translations": { - "_{count} file conflict_::_{count} file conflicts_" : [""], - "_download %n file_::_download %n files_" : [""], - "_{count} search result in other places_::_{count} search results in other places_" : [""] -},"pluralForm" :"nplurals=1; plural=0;" -}
\ No newline at end of file diff --git a/core/l10n/yo.js b/core/l10n/yo.js deleted file mode 100644 index 4cb36aaaaac..00000000000 --- a/core/l10n/yo.js +++ /dev/null @@ -1,8 +0,0 @@ -OC.L10N.register( - "core", - { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "_download %n file_::_download %n files_" : ["",""], - "_{count} search result in other places_::_{count} search results in other places_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/yo.json b/core/l10n/yo.json deleted file mode 100644 index 43fce52c5cf..00000000000 --- a/core/l10n/yo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ "translations": { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "_download %n file_::_download %n files_" : ["",""], - "_{count} search result in other places_::_{count} search results in other places_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js index c35da1944bf..c4b066f22d1 100644 --- a/lib/l10n/de_DE.js +++ b/lib/l10n/de_DE.js @@ -49,15 +49,18 @@ OC.L10N.register( "Can't read file" : "Datei kann nicht gelesen werden", "App directory already exists" : "Der Ordner für die App ist bereits vorhanden.", "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die App konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s", + "Archive does not contain a directory named %s" : "Das Archiv enthält kein Verzeichnis mit dem Namen %s", "No source specified when installing app" : "Für die Installation der Applikation wurde keine Quelle angegeben", "No href specified when installing app from http" : "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren", "No path specified when installing app from local file" : "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben", "Archives of type %s are not supported" : "Archive des Typs %s werden nicht unterstützt.", "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signatur konnte nicht überprüft werden. Bitte kontaktieren Sie den App Entwickler und überprüfen Sie Ihren Administrationsbereich.", "App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält", "App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die App kann nicht installiert werden, weil sie den <shipped>true</shipped>-Tag enthält, der bei Apps, die nicht zum Standardumfang von ownCloud gehören, nicht erlaubt ist", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Die App konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist.", "Application is not enabled" : "Die Anwendung ist nicht aktiviert", "Authentication error" : "Authentifizierungsfehler", "Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.", @@ -85,9 +88,11 @@ OC.L10N.register( "Sharing %s failed, because the backend does not allow shares from type %i" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %i nicht erlaubt.", "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert", "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt", + "Sharing %s failed, because you can not share with yourself" : "Freigabe von %s fehlgeschlagen, da das Teilen mit sich selbst nicht möglich ist", "Sharing %s failed, because the user %s does not exist" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s nicht existiert", "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s kein Gruppenmitglied einer der Gruppen von %s ist", "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", + "Sharing %s failed, because this item is already shared with user %s" : "Freigabe von %s fehlgeschlagen, da dieses Element schon mit dem Benutzer %s geteilt wird", "Sharing %s failed, because the group %s does not exist" : "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert", "Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist", "You need to provide a password to create a public link, only protected links are allowed" : "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren", @@ -103,15 +108,19 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden", "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden", "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden", + "Sharing failed, because the user %s is the original sharer" : "Freigabe fehlgeschlagen, da der Benutzer %s der ursprünglich Teilende ist", "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten", "Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte", "Sharing %s failed, because the file could not be found in the file cache" : "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte", + "Cannot increase permissions of %s" : "Konnte die Berechtigung von %s nicht anpassen", "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.", + "Cannot set expiration date more than %s days in the future" : "Ablaufdatum kann nicht mehr als %s Tage in der Zukunft liegen", "Could not find category \"%s\"" : "Die Kategorie „%s“ konnte nicht gefunden werden", "Apps" : "Apps", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Nur die follgenden Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", + "Username contains whitespace at the beginning or at the end" : "Benutzername enthält Leerzeichen am Anfang oder Ende", "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Der Benutzername existiert bereits", "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL oder PostgreSQL) installiert.", @@ -144,6 +153,10 @@ OC.L10N.register( "Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) ist ungültig", "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stellen Sie sicher, dass das Datenverzeichnis auf seiner ersten Ebene eine Datei namens „.ocdata“ enthält.", "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf „%s“ konnte nicht ermittelt werden.", - "Storage not available" : "Speicher nicht verfügbar" + "Storage unauthorized. %s" : "Speicher ungültig. %s", + "Storage incomplete configuration. %s" : "Speicher-Konfiguration unvollständig. %s", + "Storage connection error. %s" : "Speicher-Verbindungsfehler. %s", + "Storage not available" : "Speicher nicht verfügbar", + "Storage connection timeout. %s" : "Speicher-Verbindungszeitüberschreitung. %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json index dd975c2089d..e4971efdb30 100644 --- a/lib/l10n/de_DE.json +++ b/lib/l10n/de_DE.json @@ -47,15 +47,18 @@ "Can't read file" : "Datei kann nicht gelesen werden", "App directory already exists" : "Der Ordner für die App ist bereits vorhanden.", "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die App konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s", + "Archive does not contain a directory named %s" : "Das Archiv enthält kein Verzeichnis mit dem Namen %s", "No source specified when installing app" : "Für die Installation der Applikation wurde keine Quelle angegeben", "No href specified when installing app from http" : "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren", "No path specified when installing app from local file" : "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben", "Archives of type %s are not supported" : "Archive des Typs %s werden nicht unterstützt.", "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden", "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei", + "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signatur konnte nicht überprüft werden. Bitte kontaktieren Sie den App Entwickler und überprüfen Sie Ihren Administrationsbereich.", "App can't be installed because of not allowed code in the App" : "Die App kann nicht installiert werden, weil sie unerlaubten Code enthält", "App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.", "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die App kann nicht installiert werden, weil sie den <shipped>true</shipped>-Tag enthält, der bei Apps, die nicht zum Standardumfang von ownCloud gehören, nicht erlaubt ist", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "Die App konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist.", "Application is not enabled" : "Die Anwendung ist nicht aktiviert", "Authentication error" : "Authentifizierungsfehler", "Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.", @@ -83,9 +86,11 @@ "Sharing %s failed, because the backend does not allow shares from type %i" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %i nicht erlaubt.", "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert", "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt", + "Sharing %s failed, because you can not share with yourself" : "Freigabe von %s fehlgeschlagen, da das Teilen mit sich selbst nicht möglich ist", "Sharing %s failed, because the user %s does not exist" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s nicht existiert", "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Freigabe von %s fehlgeschlagen, da der Benutzer %s kein Gruppenmitglied einer der Gruppen von %s ist", "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", + "Sharing %s failed, because this item is already shared with user %s" : "Freigabe von %s fehlgeschlagen, da dieses Element schon mit dem Benutzer %s geteilt wird", "Sharing %s failed, because the group %s does not exist" : "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert", "Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist", "You need to provide a password to create a public link, only protected links are allowed" : "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren", @@ -101,15 +106,19 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden", "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden", "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden", + "Sharing failed, because the user %s is the original sharer" : "Freigabe fehlgeschlagen, da der Benutzer %s der ursprünglich Teilende ist", "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten", "Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist", "Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte", "Sharing %s failed, because the file could not be found in the file cache" : "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte", + "Cannot increase permissions of %s" : "Konnte die Berechtigung von %s nicht anpassen", "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.", + "Cannot set expiration date more than %s days in the future" : "Ablaufdatum kann nicht mehr als %s Tage in der Zukunft liegen", "Could not find category \"%s\"" : "Die Kategorie „%s“ konnte nicht gefunden werden", "Apps" : "Apps", "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Nur die follgenden Zeichen sind im Benutzernamen erlaubt: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", + "Username contains whitespace at the beginning or at the end" : "Benutzername enthält Leerzeichen am Anfang oder Ende", "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Der Benutzername existiert bereits", "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL oder PostgreSQL) installiert.", @@ -142,6 +151,10 @@ "Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) ist ungültig", "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stellen Sie sicher, dass das Datenverzeichnis auf seiner ersten Ebene eine Datei namens „.ocdata“ enthält.", "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf „%s“ konnte nicht ermittelt werden.", - "Storage not available" : "Speicher nicht verfügbar" + "Storage unauthorized. %s" : "Speicher ungültig. %s", + "Storage incomplete configuration. %s" : "Speicher-Konfiguration unvollständig. %s", + "Storage connection error. %s" : "Speicher-Verbindungsfehler. %s", + "Storage not available" : "Speicher nicht verfügbar", + "Storage connection timeout. %s" : "Speicher-Verbindungszeitüberschreitung. %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js index 5da8b1e2ab5..f611eb396d7 100644 --- a/lib/l10n/fi_FI.js +++ b/lib/l10n/fi_FI.js @@ -125,6 +125,7 @@ OC.L10N.register( "Adjusting this setting in php.ini will make ownCloud run again" : "Tämän asetuksen muuttaminen php.ini-tiedostossa saattaa ownCloudin jälleen toimintakykyiseksi", "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload on asetettu arvoon \"%s\" odotetun arvon \"0\" sijaan", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Korjaa tämä ongelma asettamalla <code>mbstring.func_overload</code> arvoon <code>0</code> php.ini-tiedostossasi", + "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Tämä johtuu todennäköisesti välimuistista tai kiihdyttimestä kuten Zend OPcachesta tai eAcceleratorista.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?", "Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.", "PostgreSQL >= 9 required" : "PostgreSQL >= 9 vaaditaan", diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json index 8e6a639846c..2447e5723c6 100644 --- a/lib/l10n/fi_FI.json +++ b/lib/l10n/fi_FI.json @@ -123,6 +123,7 @@ "Adjusting this setting in php.ini will make ownCloud run again" : "Tämän asetuksen muuttaminen php.ini-tiedostossa saattaa ownCloudin jälleen toimintakykyiseksi", "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload on asetettu arvoon \"%s\" odotetun arvon \"0\" sijaan", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Korjaa tämä ongelma asettamalla <code>mbstring.func_overload</code> arvoon <code>0</code> php.ini-tiedostossasi", + "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Tämä johtuu todennäköisesti välimuistista tai kiihdyttimestä kuten Zend OPcachesta tai eAcceleratorista.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?", "Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.", "PostgreSQL >= 9 required" : "PostgreSQL >= 9 vaaditaan", diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js index cece8a9076a..96a7cdf9d21 100644 --- a/lib/l10n/gl.js +++ b/lib/l10n/gl.js @@ -92,6 +92,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "Fallou a compartición de %s, %s non é membro do grupo %s", "You need to provide a password to create a public link, only protected links are allowed" : "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas", "Sharing %s failed, because sharing with links is not allowed" : "Fallou a compartición de %s, non está permitido compartir con ligazóns", + "Not allowed to create a federated share with the same user" : "Non está permitido crear unha compartición federada co mesmo usuario", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Fallou a compartición de %s, non foi posíbel atopar %s,é probábel que o servidor non estea accesíbel.", "Share type %s is not valid for %s" : "Non se admite a compartición do tipo %s para %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Non é posíbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s", diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json index c98788a9894..ec7813421ca 100644 --- a/lib/l10n/gl.json +++ b/lib/l10n/gl.json @@ -90,6 +90,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "Fallou a compartición de %s, %s non é membro do grupo %s", "You need to provide a password to create a public link, only protected links are allowed" : "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas", "Sharing %s failed, because sharing with links is not allowed" : "Fallou a compartición de %s, non está permitido compartir con ligazóns", + "Not allowed to create a federated share with the same user" : "Non está permitido crear unha compartición federada co mesmo usuario", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Fallou a compartición de %s, non foi posíbel atopar %s,é probábel que o servidor non estea accesíbel.", "Share type %s is not valid for %s" : "Non se admite a compartición do tipo %s para %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Non é posíbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s", diff --git a/lib/l10n/he.js b/lib/l10n/he.js index b3ac1eb5d46..e2ffb22d015 100644 --- a/lib/l10n/he.js +++ b/lib/l10n/he.js @@ -95,14 +95,21 @@ OC.L10N.register( "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "לא ניתן לקבוע תאריך תפוגה. שיתופים אינם יכולים לפוג תוקף מאוחר יותר מ- %s לאחר ששותפו", "Cannot set expiration date. Expiration date is in the past" : "לא ניתן לקבוע תאריך תפוגה. תאריך התפוגה הנו בעבר", "Cannot clear expiration date. Shares are required to have an expiration date." : "לא ניתן לבטל תאריך תפוגה. שיתופים חייבים להכיל תאריך תפוגה.", + "Sharing backend %s not found" : "צד אחורי לשיתוף %s לא נמצא", + "Sharing backend for %s not found" : "צד אחורי לשיתוף של %s לא נמצא", + "Sharing failed, because the user %s is the original sharer" : "שיתוף נכשל, כיוון שמשתמש %s הנו המשתף המקורי", "Expiration date is in the past" : "תאריך תפוגה הנו בעבר", "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Apps" : "יישומים", "A valid username must be provided" : "יש לספק שם משתמש תקני", "A valid password must be provided" : "יש לספק ססמה תקנית", + "The username is already being used" : "השם משתמש כבר בשימוש", + "Cannot write into \"config\" directory" : "לא ניתן לכתוב לתיקיית \"config\"!", "Cannot write into \"apps\" directory" : "לא ניתן לכתוב לתיקיית \"apps\"", + "Cannot create \"data\" directory (%s)" : "לא ניתן ליצור תיקיית \"data\" (%s)", "PHP module %s not installed." : "מודול PHP %s אינו מותקן.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "זה ככל הנראה נגרם על ידי מאיץ/מטמון כמו Zend OPcache או eAccelerator.", + "Please upgrade your database version" : "שדרג גירסת מסד הנתונים שלך", "Storage unauthorized. %s" : "אחסון לא מורשה. %s", "Storage incomplete configuration. %s" : "תצורה לא מושלמת של האחסון. %s", "Storage connection error. %s" : "שגיאת חיבור אחסון. %s", diff --git a/lib/l10n/he.json b/lib/l10n/he.json index 4eca14df850..27bff3f62cc 100644 --- a/lib/l10n/he.json +++ b/lib/l10n/he.json @@ -93,14 +93,21 @@ "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "לא ניתן לקבוע תאריך תפוגה. שיתופים אינם יכולים לפוג תוקף מאוחר יותר מ- %s לאחר ששותפו", "Cannot set expiration date. Expiration date is in the past" : "לא ניתן לקבוע תאריך תפוגה. תאריך התפוגה הנו בעבר", "Cannot clear expiration date. Shares are required to have an expiration date." : "לא ניתן לבטל תאריך תפוגה. שיתופים חייבים להכיל תאריך תפוגה.", + "Sharing backend %s not found" : "צד אחורי לשיתוף %s לא נמצא", + "Sharing backend for %s not found" : "צד אחורי לשיתוף של %s לא נמצא", + "Sharing failed, because the user %s is the original sharer" : "שיתוף נכשל, כיוון שמשתמש %s הנו המשתף המקורי", "Expiration date is in the past" : "תאריך תפוגה הנו בעבר", "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Apps" : "יישומים", "A valid username must be provided" : "יש לספק שם משתמש תקני", "A valid password must be provided" : "יש לספק ססמה תקנית", + "The username is already being used" : "השם משתמש כבר בשימוש", + "Cannot write into \"config\" directory" : "לא ניתן לכתוב לתיקיית \"config\"!", "Cannot write into \"apps\" directory" : "לא ניתן לכתוב לתיקיית \"apps\"", + "Cannot create \"data\" directory (%s)" : "לא ניתן ליצור תיקיית \"data\" (%s)", "PHP module %s not installed." : "מודול PHP %s אינו מותקן.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "זה ככל הנראה נגרם על ידי מאיץ/מטמון כמו Zend OPcache או eAccelerator.", + "Please upgrade your database version" : "שדרג גירסת מסד הנתונים שלך", "Storage unauthorized. %s" : "אחסון לא מורשה. %s", "Storage incomplete configuration. %s" : "תצורה לא מושלמת של האחסון. %s", "Storage connection error. %s" : "שגיאת חיבור אחסון. %s", diff --git a/lib/l10n/hy.js b/lib/l10n/hy.js index 99e80f589e4..8ee8b205e50 100644 --- a/lib/l10n/hy.js +++ b/lib/l10n/hy.js @@ -1,8 +1,10 @@ OC.L10N.register( "lib", { + "Help" : "Օգնություն", "Personal" : "Անձնական", "today" : "այսօր", - "seconds ago" : "վրկ. առաջ" + "seconds ago" : "վրկ. առաջ", + "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/hy.json b/lib/l10n/hy.json index 2ab165cfc91..d932add3048 100644 --- a/lib/l10n/hy.json +++ b/lib/l10n/hy.json @@ -1,6 +1,8 @@ { "translations": { + "Help" : "Օգնություն", "Personal" : "Անձնական", "today" : "այսօր", - "seconds ago" : "վրկ. առաջ" + "seconds ago" : "վրկ. առաջ", + "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js index cb447f8d69a..48b49fcea8c 100644 --- a/lib/l10n/ko.js +++ b/lib/l10n/ko.js @@ -95,6 +95,7 @@ OC.L10N.register( "Sharing %s failed, because %s is not a member of the group %s" : "%s을(를) 공유할 수 없습니다. %s 님이 그룹 %s의 구성원이 아닙니다", "You need to provide a password to create a public link, only protected links are allowed" : "공개 링크를 만들려면 암호를 입력해야 합니다. 보호된 링크만 사용 가능합니다", "Sharing %s failed, because sharing with links is not allowed" : "%s을(를) 공유할 수 없습니다. 링크 공유가 허용되지 않았습니다", + "Not allowed to create a federated share with the same user" : "같은 사용자와 연합 공유를 만들 수 없음", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s을(를) 공유할 수 없습니다. %s을(를) 찾을 수 없습니다. 서버에 접근하지 못할 수도 있습니다.", "Share type %s is not valid for %s" : "공유 형식 %s을(를) %s에 대해서 사용할 수 없음", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s의 권한을 설정할 수 없습니다. %s 님에게 허용된 것 이상의 권한을 필요로 합니다", diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json index b967df66ff4..3b65616b7de 100644 --- a/lib/l10n/ko.json +++ b/lib/l10n/ko.json @@ -93,6 +93,7 @@ "Sharing %s failed, because %s is not a member of the group %s" : "%s을(를) 공유할 수 없습니다. %s 님이 그룹 %s의 구성원이 아닙니다", "You need to provide a password to create a public link, only protected links are allowed" : "공개 링크를 만들려면 암호를 입력해야 합니다. 보호된 링크만 사용 가능합니다", "Sharing %s failed, because sharing with links is not allowed" : "%s을(를) 공유할 수 없습니다. 링크 공유가 허용되지 않았습니다", + "Not allowed to create a federated share with the same user" : "같은 사용자와 연합 공유를 만들 수 없음", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s을(를) 공유할 수 없습니다. %s을(를) 찾을 수 없습니다. 서버에 접근하지 못할 수도 있습니다.", "Share type %s is not valid for %s" : "공유 형식 %s을(를) %s에 대해서 사용할 수 없음", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s의 권한을 설정할 수 없습니다. %s 님에게 허용된 것 이상의 권한을 필요로 합니다", diff --git a/lib/l10n/ne.js b/lib/l10n/ne.js deleted file mode 100644 index a12702211c2..00000000000 --- a/lib/l10n/ne.js +++ /dev/null @@ -1,10 +0,0 @@ -OC.L10N.register( - "lib", - { - "_%n day ago_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""], - "_%n year ago_::_%n years ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n minute ago_::_%n minutes ago_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/ne.json b/lib/l10n/ne.json deleted file mode 100644 index b994fa289eb..00000000000 --- a/lib/l10n/ne.json +++ /dev/null @@ -1,8 +0,0 @@ -{ "translations": { - "_%n day ago_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""], - "_%n year ago_::_%n years ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n minute ago_::_%n minutes ago_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index 041b743549d..38830e67cb4 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -22,8 +22,8 @@ OC.L10N.register( "Users" : "Gebruikers", "Admin" : "Beheerder", "Recommended" : "Aanbevolen", - "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" kan niet worden geïnstalleerd omdat deze niet compatible is met deze versie van ownCloud.", - "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld: %s", + "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" kan niet worden geïnstalleerd, omdat deze niet compatible is met deze versie van ownCloud.", + "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" kan niet worden geïnstalleerd, omdat de volgende afhankelijkheden niet zijn ingevuld: %s", "No app name specified" : "Geen app naam opgegeven.", "Unknown filetype" : "Onbekend bestandsformaat", "Invalid image" : "Ongeldige afbeelding", @@ -58,9 +58,9 @@ OC.L10N.register( "App does not provide an info.xml file" : "De app heeft geen info.xml bestand", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Handtekening kon niet worden geverifieerd. Nee contact op met de ontwikkelaar van de app en check uw beheerscherm.", "App can't be installed because of not allowed code in the App" : "De app kan niet worden geïnstalleerd wegens onjuiste code in de app", - "App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud", - "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps", - "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd omdat de versie in info.xml niet dezelfde is als de versie zoals die in de app store staat vermeld", + "App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd, omdat die niet compatible is met deze versie van ownCloud", + "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstalleerd, omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd, omdat de versie in info.xml niet dezelfde is als de versie zoals die in de app store staat vermeld", "Application is not enabled" : "De applicatie is niet actief", "Authentication error" : "Authenticatie fout", "Token expired. Please reload page." : "Token verlopen. Herlaad de pagina.", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index 21a29c1757e..b8a5720d81b 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -20,8 +20,8 @@ "Users" : "Gebruikers", "Admin" : "Beheerder", "Recommended" : "Aanbevolen", - "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" kan niet worden geïnstalleerd omdat deze niet compatible is met deze versie van ownCloud.", - "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld: %s", + "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "App \"%s\" kan niet worden geïnstalleerd, omdat deze niet compatible is met deze versie van ownCloud.", + "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" kan niet worden geïnstalleerd, omdat de volgende afhankelijkheden niet zijn ingevuld: %s", "No app name specified" : "Geen app naam opgegeven.", "Unknown filetype" : "Onbekend bestandsformaat", "Invalid image" : "Ongeldige afbeelding", @@ -56,9 +56,9 @@ "App does not provide an info.xml file" : "De app heeft geen info.xml bestand", "Signature could not get checked. Please contact the app developer and check your admin screen." : "Handtekening kon niet worden geverifieerd. Nee contact op met de ontwikkelaar van de app en check uw beheerscherm.", "App can't be installed because of not allowed code in the App" : "De app kan niet worden geïnstalleerd wegens onjuiste code in de app", - "App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud", - "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps", - "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd omdat de versie in info.xml niet dezelfde is als de versie zoals die in de app store staat vermeld", + "App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd, omdat die niet compatible is met deze versie van ownCloud", + "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstalleerd, omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps", + "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd, omdat de versie in info.xml niet dezelfde is als de versie zoals die in de app store staat vermeld", "Application is not enabled" : "De applicatie is niet actief", "Authentication error" : "Authenticatie fout", "Token expired. Please reload page." : "Token verlopen. Herlaad de pagina.", diff --git a/lib/l10n/or_IN.js b/lib/l10n/or_IN.js deleted file mode 100644 index a12702211c2..00000000000 --- a/lib/l10n/or_IN.js +++ /dev/null @@ -1,10 +0,0 @@ -OC.L10N.register( - "lib", - { - "_%n day ago_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""], - "_%n year ago_::_%n years ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n minute ago_::_%n minutes ago_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/or_IN.json b/lib/l10n/or_IN.json deleted file mode 100644 index b994fa289eb..00000000000 --- a/lib/l10n/or_IN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ "translations": { - "_%n day ago_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""], - "_%n year ago_::_%n years ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n minute ago_::_%n minutes ago_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/lib/l10n/uz.js b/lib/l10n/uz.js deleted file mode 100644 index 784e8271ef3..00000000000 --- a/lib/l10n/uz.js +++ /dev/null @@ -1,10 +0,0 @@ -OC.L10N.register( - "lib", - { - "_%n day ago_::_%n days ago_" : [""], - "_%n month ago_::_%n months ago_" : [""], - "_%n year ago_::_%n years ago_" : [""], - "_%n hour ago_::_%n hours ago_" : [""], - "_%n minute ago_::_%n minutes ago_" : [""] -}, -"nplurals=1; plural=0;"); diff --git a/lib/l10n/uz.json b/lib/l10n/uz.json deleted file mode 100644 index 3a3512d508d..00000000000 --- a/lib/l10n/uz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ "translations": { - "_%n day ago_::_%n days ago_" : [""], - "_%n month ago_::_%n months ago_" : [""], - "_%n year ago_::_%n years ago_" : [""], - "_%n hour ago_::_%n hours ago_" : [""], - "_%n minute ago_::_%n minutes ago_" : [""] -},"pluralForm" :"nplurals=1; plural=0;" -}
\ No newline at end of file diff --git a/lib/l10n/yo.js b/lib/l10n/yo.js deleted file mode 100644 index a12702211c2..00000000000 --- a/lib/l10n/yo.js +++ /dev/null @@ -1,10 +0,0 @@ -OC.L10N.register( - "lib", - { - "_%n day ago_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""], - "_%n year ago_::_%n years ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n minute ago_::_%n minutes ago_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/yo.json b/lib/l10n/yo.json deleted file mode 100644 index b994fa289eb..00000000000 --- a/lib/l10n/yo.json +++ /dev/null @@ -1,8 +0,0 @@ -{ "translations": { - "_%n day ago_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""], - "_%n year ago_::_%n years ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n minute ago_::_%n minutes ago_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/lib/private/comments/comment.php b/lib/private/comments/comment.php index 31848ed38b6..60663d61578 100644 --- a/lib/private/comments/comment.php +++ b/lib/private/comments/comment.php @@ -362,7 +362,7 @@ class Comment implements IComment { protected function fromArray($data) { foreach(array_keys($data) as $key) { // translate DB keys to internal setter names - $setter = 'set' . str_replace('_', '', ucwords($key,'_')); + $setter = 'set' . implode('', array_map('ucfirst', explode('_', $key))); $setter = str_replace('Timestamp', 'DateTime', $setter); if(method_exists($this, $setter)) { diff --git a/lib/private/files/storage/wrapper/availability.php b/lib/private/files/storage/wrapper/availability.php index 55ddb0d5e8f..0ed31ba854a 100644 --- a/lib/private/files/storage/wrapper/availability.php +++ b/lib/private/files/storage/wrapper/availability.php @@ -29,6 +29,16 @@ namespace OC\Files\Storage\Wrapper; class Availability extends Wrapper { const RECHECK_TTL_SEC = 600; // 10 minutes + public static function shouldRecheck($availability) { + if (!$availability['available']) { + // trigger a recheck if TTL reached + if ((time() - $availability['last_checked']) > self::RECHECK_TTL_SEC) { + return true; + } + } + return false; + } + /** * @return bool */ @@ -47,11 +57,8 @@ class Availability extends Wrapper { */ private function isAvailable() { $availability = $this->getAvailability(); - if (!$availability['available']) { - // trigger a recheck if TTL reached - if ((time() - $availability['last_checked']) > self::RECHECK_TTL_SEC) { - return $this->updateAvailability(); - } + if (self::shouldRecheck($availability)) { + return $this->updateAvailability(); } return $availability['available']; } diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 7e9ada4174a..0b4816174bf 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -621,6 +621,32 @@ class Encryption extends Wrapper { } /** + * Update the encrypted cache version in the database + * + * @param Storage $sourceStorage + * @param string $sourceInternalPath + * @param string $targetInternalPath + * @param bool $isRename + */ + private function updateEncryptedVersion(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename) { + $isEncrypted = $this->encryptionManager->isEnabled() && $this->mount->getOption('encrypt', true) ? 1 : 0; + $cacheInformation = [ + 'encrypted' => (bool)$isEncrypted, + ]; + if($isEncrypted === 1) { + $cacheInformation['encryptedVersion'] = $sourceStorage->getCache()->get($sourceInternalPath)['encryptedVersion']; + } + + // in case of a rename we need to manipulate the source cache because + // this information will be kept for the new target + if ($isRename) { + $sourceStorage->getCache()->put($sourceInternalPath, $cacheInformation); + } else { + $this->getCache()->put($targetInternalPath, $cacheInformation); + } + } + + /** * copy file between two storages * * @param Storage $sourceStorage @@ -647,6 +673,7 @@ class Encryption extends Wrapper { $info['size'] ); } + $this->updateEncryptedVersion($sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename); } return $result; } @@ -689,15 +716,7 @@ class Encryption extends Wrapper { if ($preserveMtime) { $this->touch($targetInternalPath, $sourceStorage->filemtime($sourceInternalPath)); } - $isEncrypted = $this->encryptionManager->isEnabled() && $this->mount->getOption('encrypt', true) ? 1 : 0; - - // in case of a rename we need to manipulate the source cache because - // this information will be kept for the new target - if ($isRename) { - $sourceStorage->getCache()->put($sourceInternalPath, ['encrypted' => $isEncrypted]); - } else { - $this->getCache()->put($targetInternalPath, ['encrypted' => $isEncrypted]); - } + $this->updateEncryptedVersion($sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename); } else { // delete partially written target file $this->unlink($targetInternalPath); diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 84e3ac7dbf3..e82a1d4f2e6 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -227,7 +227,7 @@ class Manager extends PublicEmitter implements IGroupManager { */ public function getUserGroups($user) { if (is_null($user)) { - return false; + return []; } return $this->getUserIdGroups($user->getUID()); } diff --git a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php b/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php index fc261e4bc5a..766897e7517 100644 --- a/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php +++ b/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php @@ -35,8 +35,9 @@ class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator { $excludedFolders = [ rtrim($root . '/data', '/'), rtrim($root .'/themes', '/'), - rtrim($root.'/config', '/'), - rtrim($root.'/apps', '/'), + rtrim($root . '/config', '/'), + rtrim($root . '/apps', '/'), + rtrim($root . '/assets', '/'), ]; $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', ''); if($customDataDir !== '') { diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php index 647250cdb6f..c10cd8636ad 100644 --- a/lib/private/lock/dblockingprovider.php +++ b/lib/private/lock/dblockingprovider.php @@ -235,10 +235,17 @@ class DBLockingProvider extends AbstractLockingProvider { */ public function cleanExpiredLocks() { $expire = $this->timeFactory->getTime(); - $this->connection->executeUpdate( - 'DELETE FROM `*PREFIX*file_locks` WHERE `ttl` < ?', - [$expire] - ); + try { + $this->connection->executeUpdate( + 'DELETE FROM `*PREFIX*file_locks` WHERE `ttl` < ?', + [$expire] + ); + } catch (\Exception $e) { + // If the table is missing, the clean up was successful + if ($this->connection->tableExists('file_locks')) { + throw $e; + } + } } /** @@ -257,15 +264,4 @@ class DBLockingProvider extends AbstractLockingProvider { } } } - - public function __destruct() { - try { - $this->cleanExpiredLocks(); - } catch (\Exception $e) { - // If the table is missing, the clean up was successful - if ($this->connection->tableExists('file_locks')) { - throw $e; - } - } - } } diff --git a/settings/l10n/de.js b/settings/l10n/de.js index ec6099e37b6..3aac4bbe5b6 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -73,6 +73,9 @@ OC.L10N.register( "Disable" : "Deaktivieren", "Enable" : "Aktivieren", "Error while enabling app" : "Beim Aktivieren der App ist ein Fehler aufgetreten", + "Error: this app cannot be enabled because it makes the server unstable" : "Fehler: Diese Anwendung kann nicht aktiviert werden, da sie den Server instabil macht", + "Error: could not disable broken app" : "Fehler: Die beschädigte Anwendung konnte nicht deaktiviert werden", + "Error while disabling broken app" : "Beim Deaktivieren der beschädigten App ist ein Fehler aufgetreten", "Updating...." : "Aktualisierung…", "Error while updating app" : "Fehler beim Aktualisieren der App", "Updated" : "Aktualisiert", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index f554a63ae82..e7081c7a51c 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -71,6 +71,9 @@ "Disable" : "Deaktivieren", "Enable" : "Aktivieren", "Error while enabling app" : "Beim Aktivieren der App ist ein Fehler aufgetreten", + "Error: this app cannot be enabled because it makes the server unstable" : "Fehler: Diese Anwendung kann nicht aktiviert werden, da sie den Server instabil macht", + "Error: could not disable broken app" : "Fehler: Die beschädigte Anwendung konnte nicht deaktiviert werden", + "Error while disabling broken app" : "Beim Deaktivieren der beschädigten App ist ein Fehler aufgetreten", "Updating...." : "Aktualisierung…", "Error while updating app" : "Fehler beim Aktualisieren der App", "Updated" : "Aktualisiert", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index f117746971f..c4dfc201279 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -73,6 +73,9 @@ OC.L10N.register( "Disable" : "Disable", "Enable" : "Enable", "Error while enabling app" : "Error whilst enabling app", + "Error: this app cannot be enabled because it makes the server unstable" : "Error: this app cannot be enabled because it makes the server unstable", + "Error: could not disable broken app" : "Error: could not disable broken app", + "Error while disabling broken app" : "Error whilst disabling broken app", "Updating...." : "Updating....", "Error while updating app" : "Error whilst updating app", "Updated" : "Updated", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index 929084b32a9..0feeb4eee9d 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -71,6 +71,9 @@ "Disable" : "Disable", "Enable" : "Enable", "Error while enabling app" : "Error whilst enabling app", + "Error: this app cannot be enabled because it makes the server unstable" : "Error: this app cannot be enabled because it makes the server unstable", + "Error: could not disable broken app" : "Error: could not disable broken app", + "Error while disabling broken app" : "Error whilst disabling broken app", "Updating...." : "Updating....", "Error while updating app" : "Error whilst updating app", "Updated" : "Updated", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index 35804bee4a7..bb860799af1 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -72,6 +72,9 @@ OC.L10N.register( "Disable" : "Poista käytöstä", "Enable" : "Käytä", "Error while enabling app" : "Virhe ottaessa sovellusta käyttöön", + "Error: this app cannot be enabled because it makes the server unstable" : "Virhe: tätä sovellusta ei voi ottaa käyttöön, koska se tekee palvelimesta epävakaan", + "Error: could not disable broken app" : "Virhe: rikkinäisen sovelluksen poistaminen käytöstä ei onnistunut", + "Error while disabling broken app" : "Virhe rikkinäistä sovellusta käytöstä poistaessa", "Updating...." : "Päivitetään...", "Error while updating app" : "Virhe sovellusta päivittäessä", "Updated" : "Päivitetty", @@ -122,6 +125,7 @@ OC.L10N.register( "TLS" : "TLS", "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tarkista <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a> PHP-asetusten osalta, erityisesti jos käytössäsi on php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.", + "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Tämä johtuu todennäköisesti välimuistista tai kiihdyttimestä kuten Zend OPcachesta tai eAcceleratorista.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s alle version %2$s on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan %1$s-versioon.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.", @@ -204,6 +208,7 @@ OC.L10N.register( "Admin documentation" : "Ylläpitäjän ohjeistus", "Show description …" : "Näytä kuvaus…", "Hide description …" : "Piilota kuvaus…", + "This app has an update available." : "Tähän sovellukseen on päivitys saatavilla.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tälle sovellukselle ei ole määritelty ownCloudin vähimmäisversiota. Tämä johtaa virheeseen ownCloud 11:stä alkaen.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tälle sovellukselle ei ole määritelty ownCloudin enimmäisversiota. Tämä johtaa virheeseen ownCloud 11:stä alkaen.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Tätä sovellusta ei voi asentaa, koska seuraavat riippuvuudet eivät täyty:", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index 79ee34ce10e..1f9b48db6a9 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -70,6 +70,9 @@ "Disable" : "Poista käytöstä", "Enable" : "Käytä", "Error while enabling app" : "Virhe ottaessa sovellusta käyttöön", + "Error: this app cannot be enabled because it makes the server unstable" : "Virhe: tätä sovellusta ei voi ottaa käyttöön, koska se tekee palvelimesta epävakaan", + "Error: could not disable broken app" : "Virhe: rikkinäisen sovelluksen poistaminen käytöstä ei onnistunut", + "Error while disabling broken app" : "Virhe rikkinäistä sovellusta käytöstä poistaessa", "Updating...." : "Päivitetään...", "Error while updating app" : "Virhe sovellusta päivittäessä", "Updated" : "Päivitetty", @@ -120,6 +123,7 @@ "TLS" : "TLS", "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tarkista <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a> PHP-asetusten osalta, erityisesti jos käytössäsi on php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.", + "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Tämä johtuu todennäköisesti välimuistista tai kiihdyttimestä kuten Zend OPcachesta tai eAcceleratorista.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.", "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s alle version %2$s on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan %1$s-versioon.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.", @@ -202,6 +206,7 @@ "Admin documentation" : "Ylläpitäjän ohjeistus", "Show description …" : "Näytä kuvaus…", "Hide description …" : "Piilota kuvaus…", + "This app has an update available." : "Tähän sovellukseen on päivitys saatavilla.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tälle sovellukselle ei ole määritelty ownCloudin vähimmäisversiota. Tämä johtaa virheeseen ownCloud 11:stä alkaen.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Tälle sovellukselle ei ole määritelty ownCloudin enimmäisversiota. Tämä johtaa virheeseen ownCloud 11:stä alkaen.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Tätä sovellusta ei voi asentaa, koska seuraavat riippuvuudet eivät täyty:", diff --git a/settings/l10n/fil.js b/settings/l10n/fil.js new file mode 100644 index 00000000000..3f3dd8557ce --- /dev/null +++ b/settings/l10n/fil.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "settings", + { + "Password" : "Password", + "Username" : "Username" +}, +"nplurals=2; plural=(n > 1);"); diff --git a/settings/l10n/fil.json b/settings/l10n/fil.json new file mode 100644 index 00000000000..0d8a8effb23 --- /dev/null +++ b/settings/l10n/fil.json @@ -0,0 +1,5 @@ +{ "translations": { + "Password" : "Password", + "Username" : "Username" +},"pluralForm" :"nplurals=2; plural=(n > 1);" +}
\ No newline at end of file diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index 394a279658c..606f83cc879 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -67,11 +67,15 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les tests de sécurité. Elles sont activement maintenues et leur code source est ouvert. Leurs développeurs les considèrent stables pour une utilisation normale.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Cette application est nouvelle ou instable, et sa sécurité n'a pas été vérifiée. Installez-la à vos risques et périls!", "Update to %s" : "Mettre à niveau vers la version %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Vous avez %n application qui attend ça mise a jour .","Vous avez %n applications qui attendent leurs mise a jour ."], "Please wait...." : "Veuillez patienter…", "Error while disabling app" : "Erreur lors de la désactivation de l'application", "Disable" : "Désactiver", "Enable" : "Activer", "Error while enabling app" : "Erreur lors de l'activation de l'application", + "Error: this app cannot be enabled because it makes the server unstable" : "Erreur : Cette application ne peut pas être activer car cela le serveur instable .", + "Error: could not disable broken app" : "Erreur : Impossible de désactiver l’application cassé ", + "Error while disabling broken app" : "Erreur lors de la désactivation de l'application cassé .", "Updating...." : "Mise à jour...", "Error while updating app" : "Erreur lors de la mise à jour de l'application", "Updated" : "Mise à jour effectuée", @@ -103,6 +107,7 @@ OC.L10N.register( "add group" : "ajouter un groupe", "Changing the password will result in data loss, because data recovery is not available for this user" : "La modification du mot de passe entrainera la perte des données car la restauration de données n'est pas disponible pour cet utilisateur", "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi", + "Error creating user: {message}" : "Erreur a la création d'un utilisateur : {message}", "A valid password must be provided" : "Un mot de passe valide doit être saisi", "A valid email must be provided" : "Vous devez fournir une adresse e-mail valide", "__language_name__" : "Français", @@ -126,6 +131,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé. Cela peut causer des conflits en cas d'accès concurrent. Configurez 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.", "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux n'ont pu être configurés avec prise en charge d'UTF-8.", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index 9925eb8282c..0e1ce048faa 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -65,11 +65,15 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les tests de sécurité. Elles sont activement maintenues et leur code source est ouvert. Leurs développeurs les considèrent stables pour une utilisation normale.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Cette application est nouvelle ou instable, et sa sécurité n'a pas été vérifiée. Installez-la à vos risques et périls!", "Update to %s" : "Mettre à niveau vers la version %s", + "_You have %n app update pending_::_You have %n app updates pending_" : ["Vous avez %n application qui attend ça mise a jour .","Vous avez %n applications qui attendent leurs mise a jour ."], "Please wait...." : "Veuillez patienter…", "Error while disabling app" : "Erreur lors de la désactivation de l'application", "Disable" : "Désactiver", "Enable" : "Activer", "Error while enabling app" : "Erreur lors de l'activation de l'application", + "Error: this app cannot be enabled because it makes the server unstable" : "Erreur : Cette application ne peut pas être activer car cela le serveur instable .", + "Error: could not disable broken app" : "Erreur : Impossible de désactiver l’application cassé ", + "Error while disabling broken app" : "Erreur lors de la désactivation de l'application cassé .", "Updating...." : "Mise à jour...", "Error while updating app" : "Erreur lors de la mise à jour de l'application", "Updated" : "Mise à jour effectuée", @@ -101,6 +105,7 @@ "add group" : "ajouter un groupe", "Changing the password will result in data loss, because data recovery is not available for this user" : "La modification du mot de passe entrainera la perte des données car la restauration de données n'est pas disponible pour cet utilisateur", "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi", + "Error creating user: {message}" : "Erreur a la création d'un utilisateur : {message}", "A valid password must be provided" : "Un mot de passe valide doit être saisi", "A valid email must be provided" : "Vous devez fournir une adresse e-mail valide", "__language_name__" : "Français", @@ -124,6 +129,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.", "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé. Cela peut causer des conflits en cas d'accès concurrent. Configurez 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.", "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux n'ont pu être configurés avec prise en charge d'UTF-8.", diff --git a/settings/l10n/he.js b/settings/l10n/he.js index 2a92a7d60c8..c063dfc6162 100644 --- a/settings/l10n/he.js +++ b/settings/l10n/he.js @@ -73,6 +73,9 @@ OC.L10N.register( "Disable" : "ניטרול", "Enable" : "הפעלה", "Error while enabling app" : "שגיאה בעת הפעלת יישום", + "Error: this app cannot be enabled because it makes the server unstable" : "שגיאה: לא ניתן להפעיל יישום זה כיוון שהוא גורם לשרת להיות לא יציב. ", + "Error: could not disable broken app" : "שגיאה: לא ניתן לנטרל יישום פגום", + "Error while disabling broken app" : "שגיאה בזמן נטרול יישום פגום", "Updating...." : "מתבצע עדכון…", "Error while updating app" : "אירעה שגיאה בעת עדכון היישום", "Updated" : "מעודכן", diff --git a/settings/l10n/he.json b/settings/l10n/he.json index 19914c41893..abe7cbc98f2 100644 --- a/settings/l10n/he.json +++ b/settings/l10n/he.json @@ -71,6 +71,9 @@ "Disable" : "ניטרול", "Enable" : "הפעלה", "Error while enabling app" : "שגיאה בעת הפעלת יישום", + "Error: this app cannot be enabled because it makes the server unstable" : "שגיאה: לא ניתן להפעיל יישום זה כיוון שהוא גורם לשרת להיות לא יציב. ", + "Error: could not disable broken app" : "שגיאה: לא ניתן לנטרל יישום פגום", + "Error while disabling broken app" : "שגיאה בזמן נטרול יישום פגום", "Updating...." : "מתבצע עדכון…", "Error while updating app" : "אירעה שגיאה בעת עדכון היישום", "Updated" : "מעודכן", diff --git a/settings/l10n/hy.js b/settings/l10n/hy.js index 25c6ad4b587..9fc368c176a 100644 --- a/settings/l10n/hy.js +++ b/settings/l10n/hy.js @@ -1,20 +1,28 @@ OC.L10N.register( "settings", { + "Updates" : "Թարմացումներ", "Language changed" : "Լեզուն փոխվեց", + "Wrong password" : "Սխալ գաղտնաբառ", + "Unable to change password" : "Չկարողացա փոխել գաղտնաբառը", + "Saved" : "Պահված", "Delete" : "Ջնջել", "Very weak password" : "Շատ թույլ գաղտնաբառ", "Weak password" : "Թույլ գաղտնաբառ", + "So-so password" : "Միջինոտ գաղտնաբառ", "Good password" : "Լավ գաղտնաբառ", + "Strong password" : "Ուժեղ գաղտնաբառ", "Groups" : "Խմբեր", "never" : "երբեք", "add group" : "խումբ ավելացնել", "SSL" : "SSL", "TLS" : "TLS", + "days" : "օր", "Cancel" : "Չեղարկել", "Email" : "Էլ. հասցե", "Password" : "Գաղտնաբառ", "New password" : "Նոր գաղտնաբառ", + "Change password" : "Փոխել գաղտնաբառը", "Language" : "Լեզու", "Help translate" : "Օգնել թարգմանել", "Username" : "Օգտանուն", diff --git a/settings/l10n/hy.json b/settings/l10n/hy.json index 7fddfe1a132..cf0fd4d1fd8 100644 --- a/settings/l10n/hy.json +++ b/settings/l10n/hy.json @@ -1,18 +1,26 @@ { "translations": { + "Updates" : "Թարմացումներ", "Language changed" : "Լեզուն փոխվեց", + "Wrong password" : "Սխալ գաղտնաբառ", + "Unable to change password" : "Չկարողացա փոխել գաղտնաբառը", + "Saved" : "Պահված", "Delete" : "Ջնջել", "Very weak password" : "Շատ թույլ գաղտնաբառ", "Weak password" : "Թույլ գաղտնաբառ", + "So-so password" : "Միջինոտ գաղտնաբառ", "Good password" : "Լավ գաղտնաբառ", + "Strong password" : "Ուժեղ գաղտնաբառ", "Groups" : "Խմբեր", "never" : "երբեք", "add group" : "խումբ ավելացնել", "SSL" : "SSL", "TLS" : "TLS", + "days" : "օր", "Cancel" : "Չեղարկել", "Email" : "Էլ. հասցե", "Password" : "Գաղտնաբառ", "New password" : "Նոր գաղտնաբառ", + "Change password" : "Փոխել գաղտնաբառը", "Language" : "Լեզու", "Help translate" : "Օգնել թարգմանել", "Username" : "Օգտանուն", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index a8b9da67ff1..c7db1d4f8f3 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -73,6 +73,9 @@ OC.L10N.register( "Disable" : "Disabilita", "Enable" : "Abilita", "Error while enabling app" : "Errore durante l'attivazione", + "Error: this app cannot be enabled because it makes the server unstable" : "Errore: questa applicazione non può essere abilitata perché rende il server instabile", + "Error: could not disable broken app" : "Errore: impossibile disabilitare l'applicazione danneggiata", + "Error while disabling broken app" : "Errore durante la disabilitazione dell'applicazione danneggiata", "Updating...." : "Aggiornamento in corso...", "Error while updating app" : "Errore durante l'aggiornamento", "Updated" : "Aggiornato", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index a46d1a04959..4aa327c775a 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -71,6 +71,9 @@ "Disable" : "Disabilita", "Enable" : "Abilita", "Error while enabling app" : "Errore durante l'attivazione", + "Error: this app cannot be enabled because it makes the server unstable" : "Errore: questa applicazione non può essere abilitata perché rende il server instabile", + "Error: could not disable broken app" : "Errore: impossibile disabilitare l'applicazione danneggiata", + "Error while disabling broken app" : "Errore durante la disabilitazione dell'applicazione danneggiata", "Updating...." : "Aggiornamento in corso...", "Error while updating app" : "Errore durante l'aggiornamento", "Updated" : "Aggiornato", diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js index ec2f8e8fc79..51a080b06a5 100644 --- a/settings/l10n/ko.js +++ b/settings/l10n/ko.js @@ -67,11 +67,15 @@ OC.L10N.register( "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "승인된 앱은 신뢰할 수 있는 개발자가 개발하며 보안 검사를 통과했습니다. 열린 코드 저장소에서 관리되며 일반적인 환경에서 사용할 수 있는 수준으로 관리됩니다.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "이 앱의 보안 문제가 점검되지 않았고, 출시된 지 얼마 지나지 않았거나 아직 불안정합니다. 본인 책임 하에 설치하십시오.", "Update to %s" : "%s(으)로 업데이트", + "_You have %n app update pending_::_You have %n app updates pending_" : ["앱 %n개 업데이트 대기 중"], "Please wait...." : "기다려 주십시오....", "Error while disabling app" : "앱을 비활성화하는 중 오류 발생", "Disable" : "사용 안함", "Enable" : "사용함", "Error while enabling app" : "앱을 활성화하는 중 오류 발생", + "Error: this app cannot be enabled because it makes the server unstable" : "오류: 이 앱은 서버를 불안정하게 만들 수 있어서 활성화할 수 없습니다", + "Error: could not disable broken app" : "오류: 망가진 앱을 비활성화할 수 없음", + "Error while disabling broken app" : "망가진 앱을 비활성화 하는 중 오류 발생", "Updating...." : "업데이트 중....", "Error while updating app" : "앱을 업데이트하는 중 오류 발생", "Updated" : "업데이트됨", @@ -93,6 +97,7 @@ OC.L10N.register( "Strong password" : "강력한 암호", "Groups" : "그룹", "Unable to delete {objName}" : "{objName}을(를) 삭제할 수 없음", + "Error creating group: {message}" : "그룹 생성 오류: {message}", "A valid group name must be provided" : "올바른 그룹 이름을 입력해야 함", "deleted {groupName}" : "{groupName} 삭제됨", "undo" : "실행 취소", @@ -102,6 +107,7 @@ OC.L10N.register( "add group" : "그룹 추가", "Changing the password will result in data loss, because data recovery is not available for this user" : "이 사용자에 대해 데이터 복구를 사용할 수 없기 때문에, 암호를 변경하면 데이터를 잃게 됩니다.", "A valid username must be provided" : "올바른 사용자 이름을 입력해야 함", + "Error creating user: {message}" : "사용자 생성 오류: {message}", "A valid password must be provided" : "올바른 암호를 입력해야 함", "A valid email must be provided" : "올바른 이메일 주소를 입력해야 함", "__language_name__" : "한국어", @@ -207,10 +213,14 @@ OC.L10N.register( "Admin documentation" : "관리 문서", "Show description …" : "설명 보기...", "Hide description …" : "설명 숨기기...", + "This app has an update available." : "이 앱을 업데이트할 수 있습니다.", + "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "이 앱 개발자가 최대 ownCloud 버전을 지정하지 않았습니다. ownCloud 11 이후 버전에서 오류가 발생할 것입니다.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "이 앱 개발자가 최소 ownCloud 버전을 지정하지 않았습니다. ownCloud 11 이후 버전에서 오류가 발생할 것입니다.", "This app cannot be installed because the following dependencies are not fulfilled:" : "다음 의존성을 만족할 수 없기 때문에 이 앱을 설치할 수 없습니다:", "Enable only for specific groups" : "특정 그룹에만 허용", "Uninstall App" : "앱 제거", "Enable experimental apps" : "실험적인 앱 사용", + "SSL Root Certificates" : "SSL 루트 인증서", "Common Name" : "공통 이름", "Valid until" : "만료 기간:", "Issued By" : "발급자:", @@ -227,12 +237,17 @@ OC.L10N.register( "You are using <strong>%s</strong> of <strong>%s</strong>" : "현재 <strong>%s</strong> / <strong>%s</strong>을(를) 사용중입니다.", "Profile picture" : "프로필 사진", "Upload new" : "새로 업로드", + "Select from Files" : "파일에서 선택", "Remove image" : "그림 삭제", + "png or jpg, max. 20 MB" : "PNG, JPG, 최대 20MB", + "Picture provided by original account" : "원래 계정에서 제공하는 사진", "Cancel" : "취소", + "Choose as profile picture" : "프로필 사진으로 선택", "Full name" : "전체 이름", "No display name set" : "표시 이름이 설정되지 않음", "Email" : "이메일", "Your email address" : "이메일 주소", + "For password recovery and notifications" : "암호 복구와 알림에 사용", "No email address set" : "이메일 주소가 설정되지 않음", "You are member of the following groups:" : "다음 그룹의 구성원입니다:", "Password" : "암호", diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json index c5cc46c2f99..99ad33b022b 100644 --- a/settings/l10n/ko.json +++ b/settings/l10n/ko.json @@ -65,11 +65,15 @@ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "승인된 앱은 신뢰할 수 있는 개발자가 개발하며 보안 검사를 통과했습니다. 열린 코드 저장소에서 관리되며 일반적인 환경에서 사용할 수 있는 수준으로 관리됩니다.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "이 앱의 보안 문제가 점검되지 않았고, 출시된 지 얼마 지나지 않았거나 아직 불안정합니다. 본인 책임 하에 설치하십시오.", "Update to %s" : "%s(으)로 업데이트", + "_You have %n app update pending_::_You have %n app updates pending_" : ["앱 %n개 업데이트 대기 중"], "Please wait...." : "기다려 주십시오....", "Error while disabling app" : "앱을 비활성화하는 중 오류 발생", "Disable" : "사용 안함", "Enable" : "사용함", "Error while enabling app" : "앱을 활성화하는 중 오류 발생", + "Error: this app cannot be enabled because it makes the server unstable" : "오류: 이 앱은 서버를 불안정하게 만들 수 있어서 활성화할 수 없습니다", + "Error: could not disable broken app" : "오류: 망가진 앱을 비활성화할 수 없음", + "Error while disabling broken app" : "망가진 앱을 비활성화 하는 중 오류 발생", "Updating...." : "업데이트 중....", "Error while updating app" : "앱을 업데이트하는 중 오류 발생", "Updated" : "업데이트됨", @@ -91,6 +95,7 @@ "Strong password" : "강력한 암호", "Groups" : "그룹", "Unable to delete {objName}" : "{objName}을(를) 삭제할 수 없음", + "Error creating group: {message}" : "그룹 생성 오류: {message}", "A valid group name must be provided" : "올바른 그룹 이름을 입력해야 함", "deleted {groupName}" : "{groupName} 삭제됨", "undo" : "실행 취소", @@ -100,6 +105,7 @@ "add group" : "그룹 추가", "Changing the password will result in data loss, because data recovery is not available for this user" : "이 사용자에 대해 데이터 복구를 사용할 수 없기 때문에, 암호를 변경하면 데이터를 잃게 됩니다.", "A valid username must be provided" : "올바른 사용자 이름을 입력해야 함", + "Error creating user: {message}" : "사용자 생성 오류: {message}", "A valid password must be provided" : "올바른 암호를 입력해야 함", "A valid email must be provided" : "올바른 이메일 주소를 입력해야 함", "__language_name__" : "한국어", @@ -205,10 +211,14 @@ "Admin documentation" : "관리 문서", "Show description …" : "설명 보기...", "Hide description …" : "설명 숨기기...", + "This app has an update available." : "이 앱을 업데이트할 수 있습니다.", + "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "이 앱 개발자가 최대 ownCloud 버전을 지정하지 않았습니다. ownCloud 11 이후 버전에서 오류가 발생할 것입니다.", + "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "이 앱 개발자가 최소 ownCloud 버전을 지정하지 않았습니다. ownCloud 11 이후 버전에서 오류가 발생할 것입니다.", "This app cannot be installed because the following dependencies are not fulfilled:" : "다음 의존성을 만족할 수 없기 때문에 이 앱을 설치할 수 없습니다:", "Enable only for specific groups" : "특정 그룹에만 허용", "Uninstall App" : "앱 제거", "Enable experimental apps" : "실험적인 앱 사용", + "SSL Root Certificates" : "SSL 루트 인증서", "Common Name" : "공통 이름", "Valid until" : "만료 기간:", "Issued By" : "발급자:", @@ -225,12 +235,17 @@ "You are using <strong>%s</strong> of <strong>%s</strong>" : "현재 <strong>%s</strong> / <strong>%s</strong>을(를) 사용중입니다.", "Profile picture" : "프로필 사진", "Upload new" : "새로 업로드", + "Select from Files" : "파일에서 선택", "Remove image" : "그림 삭제", + "png or jpg, max. 20 MB" : "PNG, JPG, 최대 20MB", + "Picture provided by original account" : "원래 계정에서 제공하는 사진", "Cancel" : "취소", + "Choose as profile picture" : "프로필 사진으로 선택", "Full name" : "전체 이름", "No display name set" : "표시 이름이 설정되지 않음", "Email" : "이메일", "Your email address" : "이메일 주소", + "For password recovery and notifications" : "암호 복구와 알림에 사용", "No email address set" : "이메일 주소가 설정되지 않음", "You are member of the following groups:" : "다음 그룹의 구성원입니다:", "Password" : "암호", diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js index e5835376779..d745ba465b8 100644 --- a/settings/l10n/nb_NO.js +++ b/settings/l10n/nb_NO.js @@ -73,6 +73,9 @@ OC.L10N.register( "Disable" : "Deaktiver ", "Enable" : "Aktiver", "Error while enabling app" : "Aktivering av app feilet", + "Error: this app cannot be enabled because it makes the server unstable" : "Feil: Denne appen kan ikke aktiveres fordi den gjør serveren ustabil", + "Error: could not disable broken app" : "Feil: Kunne ikke deaktivere ustabil app", + "Error while disabling broken app" : "Feil ved deaktivering av ustabil app", "Updating...." : "Oppdaterer...", "Error while updating app" : "Feil ved oppdatering av app", "Updated" : "Oppdatert", diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json index 3b038c1cbef..eed64672207 100644 --- a/settings/l10n/nb_NO.json +++ b/settings/l10n/nb_NO.json @@ -71,6 +71,9 @@ "Disable" : "Deaktiver ", "Enable" : "Aktiver", "Error while enabling app" : "Aktivering av app feilet", + "Error: this app cannot be enabled because it makes the server unstable" : "Feil: Denne appen kan ikke aktiveres fordi den gjør serveren ustabil", + "Error: could not disable broken app" : "Feil: Kunne ikke deaktivere ustabil app", + "Error while disabling broken app" : "Feil ved deaktivering av ustabil app", "Updating...." : "Oppdaterer...", "Error while updating app" : "Feil ved oppdatering av app", "Updated" : "Oppdatert", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index d89f9f2f96d..5f02537f10c 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -69,10 +69,13 @@ OC.L10N.register( "Update to %s" : "Bijgewerkt naar %s", "_You have %n app update pending_::_You have %n app updates pending_" : ["Er is een update voor een applicatie","Er zijn %n applicaties die geupdate kunnen worden"], "Please wait...." : "Even geduld a.u.b.", - "Error while disabling app" : "Fout tijdens het uitzetten van het programma", + "Error while disabling app" : "Fout tijdens het uitzetten van de app", "Disable" : "Uitschakelen", "Enable" : "Activeer", "Error while enabling app" : "Fout tijdens het aanzetten van het programma", + "Error: this app cannot be enabled because it makes the server unstable" : "Fout: deze app kan niet geïnstalleerd worden, omdat het de server onstabiel maakt", + "Error: could not disable broken app" : "Fout: kan kapotte app niet uitschakelen", + "Error while disabling broken app" : "Fout bij het uitzetten van de niet werkende app", "Updating...." : "Bijwerken....", "Error while updating app" : "Fout bij bijwerken app", "Updated" : "Bijgewerkt", @@ -216,7 +219,7 @@ OC.L10N.register( "This app has an update available." : "Er is een update beschikbaar voor deze applicatie.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen minimum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen maximum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", - "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:", + "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd, omdat de volgende afhankelijkheden niet zijn ingevuld:", "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren", "Uninstall App" : "De-installeren app", "Enable experimental apps" : "Inschakelen experimentele apps", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index 9eff1d0f578..62d06a18683 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -67,10 +67,13 @@ "Update to %s" : "Bijgewerkt naar %s", "_You have %n app update pending_::_You have %n app updates pending_" : ["Er is een update voor een applicatie","Er zijn %n applicaties die geupdate kunnen worden"], "Please wait...." : "Even geduld a.u.b.", - "Error while disabling app" : "Fout tijdens het uitzetten van het programma", + "Error while disabling app" : "Fout tijdens het uitzetten van de app", "Disable" : "Uitschakelen", "Enable" : "Activeer", "Error while enabling app" : "Fout tijdens het aanzetten van het programma", + "Error: this app cannot be enabled because it makes the server unstable" : "Fout: deze app kan niet geïnstalleerd worden, omdat het de server onstabiel maakt", + "Error: could not disable broken app" : "Fout: kan kapotte app niet uitschakelen", + "Error while disabling broken app" : "Fout bij het uitzetten van de niet werkende app", "Updating...." : "Bijwerken....", "Error while updating app" : "Fout bij bijwerken app", "Updated" : "Bijgewerkt", @@ -214,7 +217,7 @@ "This app has an update available." : "Er is een update beschikbaar voor deze applicatie.", "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen minimum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "Deze app heeft geen maximum ownCloud versienummer toegewezen gekregen. Dit wordt een fout in ownCloud 11 en later.", - "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:", + "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd, omdat de volgende afhankelijkheden niet zijn ingevuld:", "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren", "Uninstall App" : "De-installeren app", "Enable experimental apps" : "Inschakelen experimentele apps", diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js index 99b1bdd38a2..97fbe047c95 100644 --- a/settings/l10n/pl.js +++ b/settings/l10n/pl.js @@ -181,6 +181,7 @@ OC.L10N.register( "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia", "Show storage location" : "Pokaż miejsce przechowywania", "Show last log in" : "Pokaż ostatni login", + "Show user backend" : "Pokaż moduł użytkownika", "Send email to new user" : "Wyślij email do nowego użytkownika", "Show email address" : "Pokaż adres email", "Username" : "Nazwa użytkownika", diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json index 93274c14f26..b313393dfc1 100644 --- a/settings/l10n/pl.json +++ b/settings/l10n/pl.json @@ -179,6 +179,7 @@ "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia", "Show storage location" : "Pokaż miejsce przechowywania", "Show last log in" : "Pokaż ostatni login", + "Show user backend" : "Pokaż moduł użytkownika", "Send email to new user" : "Wyślij email do nowego użytkownika", "Show email address" : "Pokaż adres email", "Username" : "Nazwa użytkownika", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 5dbc6369449..844032b86b7 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -73,6 +73,9 @@ OC.L10N.register( "Disable" : "Desabilitar", "Enable" : "Habilitar", "Error while enabling app" : "Erro enquanto habilitava o aplicativo", + "Error: this app cannot be enabled because it makes the server unstable" : "Erro: este aplicativo não pode ser habilitado porque faz com que o servidor fique instável", + "Error: could not disable broken app" : "Erro: Não foi possível desativar o aplicativo quebrado", + "Error while disabling broken app" : "Erro ao desativar aplicativo quebrado", "Updating...." : "Atualizando...", "Error while updating app" : "Erro ao atualizar aplicativo", "Updated" : "Atualizado", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index 189e0f5be21..0800c4f006d 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -71,6 +71,9 @@ "Disable" : "Desabilitar", "Enable" : "Habilitar", "Error while enabling app" : "Erro enquanto habilitava o aplicativo", + "Error: this app cannot be enabled because it makes the server unstable" : "Erro: este aplicativo não pode ser habilitado porque faz com que o servidor fique instável", + "Error: could not disable broken app" : "Erro: Não foi possível desativar o aplicativo quebrado", + "Error while disabling broken app" : "Erro ao desativar aplicativo quebrado", "Updating...." : "Atualizando...", "Error while updating app" : "Erro ao atualizar aplicativo", "Updated" : "Atualizado", diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js index c37cf5d6217..976e77145c4 100644 --- a/settings/l10n/sl.js +++ b/settings/l10n/sl.js @@ -179,6 +179,7 @@ OC.L10N.register( "Admin documentation" : "Skrbniška dokumentacija", "Show description …" : "Pokaži opis ...", "Hide description …" : "Skrij opis ...", + "This app has an update available." : "Za program so na voljo posodobitve.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:", "Enable only for specific groups" : "Omogoči le za posamezne skupine", "Uninstall App" : "Odstrani program", @@ -204,10 +205,12 @@ OC.L10N.register( "Remove image" : "Odstrani sliko", "png or jpg, max. 20 MB" : "png ali jpg, največ. 20 MB", "Cancel" : "Prekliči", + "Choose as profile picture" : "Izberi kot sliko profila", "Full name" : "Polno ime", "No display name set" : "Ime za prikaz ni bilo nastavljeno", "Email" : "Elektronski naslov", "Your email address" : "Osebni elektronski naslov", + "For password recovery and notifications" : "Za obnovo gesla in obveščanje", "No email address set" : "Poštni naslov ni bil vpisan", "You are member of the following groups:" : "Vi ste član sledečih skupin:", "Password" : "Geslo", diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json index a619a04f963..e212815124d 100644 --- a/settings/l10n/sl.json +++ b/settings/l10n/sl.json @@ -177,6 +177,7 @@ "Admin documentation" : "Skrbniška dokumentacija", "Show description …" : "Pokaži opis ...", "Hide description …" : "Skrij opis ...", + "This app has an update available." : "Za program so na voljo posodobitve.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:", "Enable only for specific groups" : "Omogoči le za posamezne skupine", "Uninstall App" : "Odstrani program", @@ -202,10 +203,12 @@ "Remove image" : "Odstrani sliko", "png or jpg, max. 20 MB" : "png ali jpg, največ. 20 MB", "Cancel" : "Prekliči", + "Choose as profile picture" : "Izberi kot sliko profila", "Full name" : "Polno ime", "No display name set" : "Ime za prikaz ni bilo nastavljeno", "Email" : "Elektronski naslov", "Your email address" : "Osebni elektronski naslov", + "For password recovery and notifications" : "Za obnovo gesla in obveščanje", "No email address set" : "Poštni naslov ni bil vpisan", "You are member of the following groups:" : "Vi ste član sledečih skupin:", "Password" : "Geslo", diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js index 5a9b4ca678d..68ba5c58a3e 100644 --- a/settings/l10n/sq.js +++ b/settings/l10n/sq.js @@ -73,6 +73,9 @@ OC.L10N.register( "Disable" : "Çaktivizoje", "Enable" : "Aktivizoje", "Error while enabling app" : "Gabim në aktivizimin e aplikacionit", + "Error: this app cannot be enabled because it makes the server unstable" : "Gabim: ky aplikacion s’u aktivizua dot, ngaqë e bën shërbyesin të paqëndrueshëm.", + "Error: could not disable broken app" : "Gabim: s’u çaktivizua dot aplikacion i dëmtuar", + "Error while disabling broken app" : "Gabim teka çaktivizohej aplikacion i dëmtuar", "Updating...." : "Po përditësohet…", "Error while updating app" : "Gabim gjatë përditësimit të aplikacionit", "Updated" : "U përditësua", diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json index 5962f5bf68a..a27d763a618 100644 --- a/settings/l10n/sq.json +++ b/settings/l10n/sq.json @@ -71,6 +71,9 @@ "Disable" : "Çaktivizoje", "Enable" : "Aktivizoje", "Error while enabling app" : "Gabim në aktivizimin e aplikacionit", + "Error: this app cannot be enabled because it makes the server unstable" : "Gabim: ky aplikacion s’u aktivizua dot, ngaqë e bën shërbyesin të paqëndrueshëm.", + "Error: could not disable broken app" : "Gabim: s’u çaktivizua dot aplikacion i dëmtuar", + "Error while disabling broken app" : "Gabim teka çaktivizohej aplikacion i dëmtuar", "Updating...." : "Po përditësohet…", "Error while updating app" : "Gabim gjatë përditësimit të aplikacionit", "Updated" : "U përditësua", diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index c18e518fe6d..b5ec15b12bf 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -693,11 +693,19 @@ class Encryption extends Storage { $temp = \OC::$server->getTempManager(); return fopen($temp->getTemporaryFile(), $mode); }); - + if($expectedEncrypted) { + $cache = $this->getMock('\OCP\Files\Cache\ICache'); + $cache->expects($this->once()) + ->method('get') + ->with($sourceInternalPath) + ->willReturn(['encryptedVersion' => 12345]); + $storage2->expects($this->once()) + ->method('getCache') + ->willReturn($cache); + } $this->encryptionManager->expects($this->any()) ->method('isEnabled') ->willReturn($encryptionEnabled); - // FIXME can not overwrite the return after definition // $this->mount->expects($this->at(0)) // ->method('getOption') @@ -706,9 +714,16 @@ class Encryption extends Storage { global $mockedMountPointEncryptionEnabled; $mockedMountPointEncryptionEnabled = $mountPointEncryptionEnabled; + $expectedCachePut = [ + 'encrypted' => $expectedEncrypted, + ]; + if($expectedEncrypted === true) { + $expectedCachePut['encryptedVersion'] = 12345; + } + $this->cache->expects($this->once()) ->method('put') - ->with($sourceInternalPath, ['encrypted' => $expectedEncrypted]); + ->with($sourceInternalPath, $expectedCachePut); $this->invokePrivate($this->instance, 'copyBetweenStorage', [$storage2, $sourceInternalPath, $targetInternalPath, $preserveMtime, $isRename]); @@ -765,10 +780,10 @@ class Encryption extends Storage { ->with($sourceStorage, $sourceInternalPath, $targetInternalPath) ->willReturn($copyResult); + $instance->expects($this->any())->method('getCache') + ->willReturn($cache); + if ($copyResult) { - $instance->expects($this->once())->method('getCache') - ->with('', $sourceStorage) - ->willReturn($cache); $cache->expects($this->once())->method('get') ->with($sourceInternalPath) ->willReturn(['encrypted' => $encrypted, 'size' => 42]); |