Merge remote-tracking branch 'upstream/master'

nextcloud · Jul 1, 2019 · 28499f4 · 28499f4
2 parents 151c228 + 1074e98
commit 28499f4
Show file tree

Hide file tree

Showing 33 changed files with 90 additions and 33 deletions.
diff --git a/apps/accessibility/l10n/el.js b/apps/accessibility/l10n/el.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Web Content Accessibility Guidelines" : "Οδηγίες προσβασιμότητας περιεχομένου ιστού",
     "our issue tracker" : "ο ανιχνευτής ζητημάτων μας",
     "our design team" : "η ομάδα σχεδιασμού μας",
-    "Enable" : "Ενεργοποίηση"
+    "Enable" : "Ενεργοποίηση",
+    "Themes" : "Θέματα",
+    "Fonts" : "Γραμματοσειρές",
+    "enabled" : "ενεργοποιημένο"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/accessibility/l10n/el.json b/apps/accessibility/l10n/el.json
@@ -11,6 +11,9 @@
     "Web Content Accessibility Guidelines" : "Οδηγίες προσβασιμότητας περιεχομένου ιστού",
     "our issue tracker" : "ο ανιχνευτής ζητημάτων μας",
     "our design team" : "η ομάδα σχεδιασμού μας",
-    "Enable" : "Ενεργοποίηση"
+    "Enable" : "Ενεργοποίηση",
+    "Themes" : "Θέματα",
+    "Fonts" : "Γραμματοσειρές",
+    "enabled" : "ενεργοποιημένο"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -227,7 +227,7 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
 
 		$nav->assign('navigationItems', $navItems);
 
-		$nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
+		$nav->assign('usage', \OC_Helper::humanFileSize(ceil($storageInfo['used'] / 102400) * 102400));
 		if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 			$totalSpace = $this->l10n->t('Unlimited');
 		} else {

diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
@@ -9,26 +9,23 @@
 		}
 		?>
 
-		<li id="quota"
-			class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?><?php
-			if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			?>has-tooltip" title="<?php p($_['usage_relative'] . '%, ');
-			p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));
-		} ?>">
-			<a href="#" class="icon-quota svg">
-				<p id="quotatext"><?php
-					if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-						p($l->t('%1$s%% of %2$s used', [round($_['usage_relative'], 1), $_['total_space']]));
-					} else {
-						p($l->t('%s used', [$_['usage']]));
-					} ?></p>
-				<div class="quota-container">
-					<progress value="<?php p($_['usage_relative']); ?>"
-							  max="100"
-						<?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
-				</div>
-			</a>
-		</li>
+		<?php if($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
+			<li id="quota" class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>">
+				<a href="#" class="icon-quota svg">
+					<p><?php p($l->t('%s used', [$_['usage']])); ?></p>
+				</a>
+			</li>
+		<?php else: ?>
+			<li id="quota" class="has-tooltip pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>"
+				title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']])); ?>">
+				<a href="#" class="icon-quota svg">
+					<p id="quotatext"><?php p($l->t('%1$s of %2$s used', [$_['usage'], $_['total_space']])); ?></p>
+					<div class="quota-container">
+						<progress value="<?php p($_['usage_relative']); ?>" max="100" class="<?= ($_['usage_relative'] > 80) ? 'warn' : '' ?>"></progress>
+					</div>
+				</a>
+			</li>
+		<?php endif; ?>
 	</ul>
 	<div id="app-settings">
 		<div id="app-settings-header">

diff --git a/apps/oauth2/lib/Settings/Admin.php b/apps/oauth2/lib/Settings/Admin.php
@@ -41,6 +41,6 @@ public function getSection(): string {
 	}
 
 	public function getPriority(): int {
-		return 0;
+		return 100;
 	}
 }
diff --git a/apps/oauth2/tests/Settings/AdminTest.php b/apps/oauth2/tests/Settings/AdminTest.php
@@ -51,6 +51,6 @@ public function testGetSection() {
 	}
 
 	public function testGetPriority() {
-		$this->assertSame(0, $this->admin->getPriority());
+		$this->assertSame(100, $this->admin->getPriority());
 	}
 }
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -587,7 +587,7 @@ protected function sendPasswordToOwner(IShare $share, $password) {
 			);
 		}
 
-		$bodyPart = $this->l->t('You just shared »%1$s« with %2$s. The share was already send to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
+		$bodyPart = $this->l->t('You just shared »%1$s« with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
 
 		$message = $this->mailer->createMessage();
 		$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
@@ -67,7 +67,7 @@ $invert: luma($color-primary) > 0.6;
 		}
 		a,
 		label,
-		p,
+		footer p,
 		#alternative-logins legend,
 		.lost-password-container #lost-password {
 			color: $color-primary-text;

diff --git a/core/l10n/de.js b/core/l10n/de.js
diff --git a/core/l10n/de.json b/core/l10n/de.json
@@ -237,6 +237,7 @@
     "Search contacts …" : "Kontakte suchen…",
     "No contacts found" : "Keine Kontakte gefunden",
     "Show all contacts …" : "Zeige alle Kontakte…",
+    "Install the Contacts app" : "Kontake-App installieren",
     "Loading your contacts …" : "Lade Deine Kontakte…",
     "Looking for {term} …" : "Suche nach {term}…",
     "No" : "Nein",

diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
@@ -237,6 +237,7 @@
     "Search contacts …" : "Kontakte suchen…",
     "No contacts found" : "Keine Kontakte gefunden",
     "Show all contacts …" : "Zeige alle Kontakte…",
+    "Install the Contacts app" : "Kontake-App installieren",
     "Loading your contacts …" : "Lade Ihre Kontakte…",
     "Looking for {term} …" : "Suche nach {term}…",
     "No" : "Nein",

diff --git a/core/l10n/eu.js b/core/l10n/eu.js
@@ -85,6 +85,7 @@ OC.L10N.register(
     "Share link" : "Partekatu esteka",
     "Could not unshare" : "Ezin izan da despartekatu",
     "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin partekatuta",
+    "Shared with you and {circle} by {owner}" : " {owner}-(e)k zurekin eta {circle}-(r)ekin partekatua",
     "Shared with you by {owner}" : "{owner}-k zurekin partekatuta",
     "Choose a password for the mail share" : "Hautatu pasahitz bat posta partekatzeko",
     "group" : "taldea",

diff --git a/core/l10n/eu.json b/core/l10n/eu.json
@@ -83,6 +83,7 @@
     "Share link" : "Partekatu esteka",
     "Could not unshare" : "Ezin izan da despartekatu",
     "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin partekatuta",
+    "Shared with you and {circle} by {owner}" : " {owner}-(e)k zurekin eta {circle}-(r)ekin partekatua",
     "Shared with you by {owner}" : "{owner}-k zurekin partekatuta",
     "Choose a password for the mail share" : "Hautatu pasahitz bat posta partekatzeko",
     "group" : "taldea",

diff --git a/core/l10n/fr.js b/core/l10n/fr.js
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
@@ -237,6 +237,7 @@
     "Search contacts …" : "Rechercher un contact...",
     "No contacts found" : "Aucun contact trouvé",
     "Show all contacts …" : "Montrer tous les contacts...",
+    "Install the Contacts app" : "Installer l'appli Contacts",
     "Loading your contacts …" : "Chargement de vos contacts...",
     "Looking for {term} …" : "Recherche de {term} ...",
     "No" : "Non",

diff --git a/core/l10n/gl.js b/core/l10n/gl.js
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
@@ -237,6 +237,7 @@
     "Search contacts …" : "Buscar contactos …",
     "No contacts found" : "Non se atoparon contactos",
     "Show all contacts …" : "Amosar todos os contactos…",
+    "Install the Contacts app" : "Instalar o apli de Contactos",
     "Loading your contacts …" : "Cargando os seus contactos …",
     "Looking for {term} …" : "Buscando {term} …",
     "No" : "Non",

diff --git a/core/l10n/it.js b/core/l10n/it.js
diff --git a/core/l10n/it.json b/core/l10n/it.json
@@ -237,6 +237,7 @@
     "Search contacts …" : "Cerca contatti...",
     "No contacts found" : "Nessun contatto trovato",
     "Show all contacts …" : "Mostra tutti i contatti...",
+    "Install the Contacts app" : "Installa l'applicazione Contatti",
     "Loading your contacts …" : "Caricamento dei tuoi contatti...",
     "Looking for {term} …" : "Ricerca di {term} in corso...",
     "No" : "No",

diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
@@ -237,6 +237,7 @@
     "Search contacts …" : "Procurar contatos...",
     "No contacts found" : "Nenhum contato encontrado",
     "Show all contacts …" : "Exibir todos os contatos...",
+    "Install the Contacts app" : "Instalar o aplicativo Contatos",
     "Loading your contacts …" : "Carregando seus contatos...",
     "Looking for {term} …" : "Procurando por {term}…",
     "No" : "Não",

diff --git a/core/l10n/ru.js b/core/l10n/ru.js
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
@@ -237,6 +237,7 @@
     "Search contacts …" : "Искать контакты…",
     "No contacts found" : "Контактов не найдено",
     "Show all contacts …" : "Показать все контакты…",
+    "Install the Contacts app" : "Установить приложение Contacts",
     "Loading your contacts …" : "Загрузка контактов…",
     "Looking for {term} …" : "Поиск {term}…",
     "No" : "Нет",

diff --git a/core/l10n/tr.js b/core/l10n/tr.js
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
@@ -237,6 +237,7 @@
     "Search contacts …" : "Kişi arama...",
     "No contacts found" : "Herhangi bir kişi bulunamadı",
     "Show all contacts …" : "Tüm kişileri görüntüle...",
+    "Install the Contacts app" : "Kişiler uygulamasını kur",
     "Loading your contacts …" : "Kişileriniz yükleniyor...",
     "Looking for {term} …" : "{term} ifadesi aranıyor...",
     "No" : "Hayır",

diff --git a/core/shipped.json b/core/shipped.json
@@ -12,6 +12,7 @@
     "files",
     "files_external",
     "files_pdfviewer",
+    "files_rightclick",
     "files_sharing",
     "files_texteditor",
     "files_trashbin",
@@ -33,6 +34,7 @@
     "support",
     "survey_client",
     "systemtags",
+    "text",
     "theming",
     "twofactor_backupcodes",
     "updatenotification",

diff --git a/settings/l10n/de.js b/settings/l10n/de.js
@@ -631,7 +631,7 @@ OC.L10N.register(
     "The backend does not support changing the display name" : "Das Backend unterstützt keine Änderung des Anzeigenamens",
     "New password" : "Neues Passwort",
     "Add user in group" : "Nutzer zur Gruppe hinzufügen",
-    "Set user as admin for" : "Nutzer als Administrator setzen für",
+    "Set user as admin for" : "Benutzer als Administrator setzen für",
     "Select user quota" : "Speicherkontigent wählen",
     "No language set" : "Keine Sprache eingestellt.",
     "Never" : "Niemals",

diff --git a/settings/l10n/de.json b/settings/l10n/de.json
@@ -629,7 +629,7 @@
     "The backend does not support changing the display name" : "Das Backend unterstützt keine Änderung des Anzeigenamens",
     "New password" : "Neues Passwort",
     "Add user in group" : "Nutzer zur Gruppe hinzufügen",
-    "Set user as admin for" : "Nutzer als Administrator setzen für",
+    "Set user as admin for" : "Benutzer als Administrator setzen für",
     "Select user quota" : "Speicherkontigent wählen",
     "No language set" : "Keine Sprache eingestellt.",
     "Never" : "Niemals",

diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
@@ -631,7 +631,7 @@ OC.L10N.register(
     "The backend does not support changing the display name" : "Das Backend unterstützt keine Änderung des Anzeigenamens",
     "New password" : "Neues Passwort",
     "Add user in group" : "Nutzer zur Gruppe hinzufügen",
-    "Set user as admin for" : "Nutzer als Administrator setzen für",
+    "Set user as admin for" : "Benutzer als Administrator setzen für",
     "Select user quota" : "Speicherkontigent wählen",
     "No language set" : "Keine Sprache eingestellt.",
     "Never" : "Niemals",

diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
@@ -629,7 +629,7 @@
     "The backend does not support changing the display name" : "Das Backend unterstützt keine Änderung des Anzeigenamens",
     "New password" : "Neues Passwort",
     "Add user in group" : "Nutzer zur Gruppe hinzufügen",
-    "Set user as admin for" : "Nutzer als Administrator setzen für",
+    "Set user as admin for" : "Benutzer als Administrator setzen für",
     "Select user quota" : "Speicherkontigent wählen",
     "No language set" : "Keine Sprache eingestellt.",
     "Never" : "Niemals",

diff --git a/settings/l10n/hu.js b/settings/l10n/hu.js
@@ -73,8 +73,12 @@ OC.L10N.register(
     "Go to %s" : "Menj ide: %s",
     "Install Client" : "Kliens telepítés",
     "Logged in user must be a subadmin" : "Nem rendszergazda felhasználóként kell bejelentkezzen",
+    "Create" : "Létrehozás",
+    "Change" : "Módosít",
     "Delete" : "Törlés",
+    "Share" : "Megosztás",
     "Unlimited" : "Korlátlan",
+    "Verifying" : "Ellenőrzés",
     "Verifying …" : "Ellenőrzés...",
     "Verify" : "Ellenőrzés",
     "Migration in progress. Please wait until the migration is finished" : "Migráció folyamatban. Kérlek várj, míg a migráció befejeződik.",
@@ -146,6 +150,7 @@ OC.L10N.register(
     "Done" : "Kész",
     "Copied!" : "Másolva!",
     "Copy" : "Másol",
+    "Supported" : "Támogatott",
     "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "A hivatalos alkalmazásokat a közösség fejleszti. Ezek adják a központi funkcionalitásokat és éles rendszerekben használhatóak.",
     "Official" : "Hivatalos",
     "by" : "által",
@@ -349,6 +354,18 @@ OC.L10N.register(
     "Help translate" : "Segítsen a fordításban",
     "Locale" : "Területi beállítás",
     "Current password" : "Jelenlegi jelszó",
-    "Change password" : "Jelszó megváltoztatása"
+    "Change password" : "Jelszó megváltoztatása",
+    "Disconnect" : "Szétkapcsolás",
+    "iPhone iOS" : "iPhone iOS",
+    "iPad iOS" : "iPad iOS",
+    "iOS Client" : "iOS kliens",
+    "Android Client" : "Android kliens",
+    "Not supported!" : "Nem támogatott.",
+    "Press ⌘-C to copy." : "A másoláshoz nyomj ⌘-C-t.",
+    "Press Ctrl-C to copy." : "A másoláshoz nyomj Ctrl-C-t.",
+    "Error while loading browser sessions and device tokens" : "Hiba a böngésző munkamenet és az eszköz tokenek betöltése közben.",
+    "Default quota :" : "Alapértelmezett kvóta :",
+    "Follow us on Google+" : "Kövess Google+ -on",
+    "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "Jelenleg használt: <strong>%s</strong>, ebből: <strong>%s</strong> (<strong>%s %%</strong>)"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hu.json b/settings/l10n/hu.json
@@ -71,8 +71,12 @@
     "Go to %s" : "Menj ide: %s",
     "Install Client" : "Kliens telepítés",
     "Logged in user must be a subadmin" : "Nem rendszergazda felhasználóként kell bejelentkezzen",
+    "Create" : "Létrehozás",
+    "Change" : "Módosít",
     "Delete" : "Törlés",
+    "Share" : "Megosztás",
     "Unlimited" : "Korlátlan",
+    "Verifying" : "Ellenőrzés",
     "Verifying …" : "Ellenőrzés...",
     "Verify" : "Ellenőrzés",
     "Migration in progress. Please wait until the migration is finished" : "Migráció folyamatban. Kérlek várj, míg a migráció befejeződik.",
@@ -144,6 +148,7 @@
     "Done" : "Kész",
     "Copied!" : "Másolva!",
     "Copy" : "Másol",
+    "Supported" : "Támogatott",
     "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "A hivatalos alkalmazásokat a közösség fejleszti. Ezek adják a központi funkcionalitásokat és éles rendszerekben használhatóak.",
     "Official" : "Hivatalos",
     "by" : "által",
@@ -347,6 +352,18 @@
     "Help translate" : "Segítsen a fordításban",
     "Locale" : "Területi beállítás",
     "Current password" : "Jelenlegi jelszó",
-    "Change password" : "Jelszó megváltoztatása"
+    "Change password" : "Jelszó megváltoztatása",
+    "Disconnect" : "Szétkapcsolás",
+    "iPhone iOS" : "iPhone iOS",
+    "iPad iOS" : "iPad iOS",
+    "iOS Client" : "iOS kliens",
+    "Android Client" : "Android kliens",
+    "Not supported!" : "Nem támogatott.",
+    "Press ⌘-C to copy." : "A másoláshoz nyomj ⌘-C-t.",
+    "Press Ctrl-C to copy." : "A másoláshoz nyomj Ctrl-C-t.",
+    "Error while loading browser sessions and device tokens" : "Hiba a böngésző munkamenet és az eszköz tokenek betöltése közben.",
+    "Default quota :" : "Alapértelmezett kvóta :",
+    "Follow us on Google+" : "Kövess Google+ -on",
+    "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "Jelenleg használt: <strong>%s</strong>, ebből: <strong>%s</strong> (<strong>%s %%</strong>)"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }