From f1c0c90ac990916ea5f8091b3f0674b41c06ddde Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 19 Jul 2016 11:37:20 +0200
Subject: [PATCH 1/3] simplify wording of Sessions and App passwords sections

---
 settings/templates/personal.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 2f656d39fb..e3164eb5b9 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -167,12 +167,12 @@ if($_['passwordChangeSupported']) {
 
 <div id="sessions" class="section">
 	<h2><?php p($l->t('Sessions'));?></h2>
-	<span class="hidden-when-empty"><?php p($l->t('These are the web, desktop and mobile clients currently logged in to your account.'));?></span>
+	<span class="hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
 	<table>
 		<thead class="token-list-header">
 			<tr>
-				<th><?php p($l->t('Browser'));?></th>
-				<th><?php p($l->t('Most recent activity'));?></th>
+				<th><?php p($l->t('Device'));?></th>
+				<th><?php p($l->t('Recent activity'));?></th>
 				<th></th>
 			</tr>
 		</thead>
@@ -183,19 +183,18 @@ if($_['passwordChangeSupported']) {
 
 <div id="apppasswords" class="section">
 	<h2><?php p($l->t('App passwords'));?></h2>
-	<span class="hidden-when-empty"><?php p($l->t("You've linked these apps."));?></span>
+	<p><?php p($l->t('Passcodes that give an app or device permissions to access your account.'));?></p>
 	<table>
 		<thead class="hidden-when-empty">
 			<tr>
 				<th><?php p($l->t('Name'));?></th>
-				<th><?php p($l->t('Most recent activity'));?></th>
+				<th><?php p($l->t('Recent activity'));?></th>
 				<th></th>
 			</tr>
 		</thead>
 		<tbody class="token-list icon-loading">
 		</tbody>
 	</table>
-	<p><?php p($l->t('An app password is a passcode that gives an app or device permissions to access your %s account.', [$theme->getName()]));?></p>
 	<div id="app-password-form">
 		<input id="app-password-name" type="text" placeholder="<?php p($l->t('App name')); ?>">
 		<button id="add-app-password" class="button"><?php p($l->t('Create new app password')); ?></button>

From 762cc2a77389aa16369c7cfeeb3b08434092c707 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 19 Jul 2016 11:37:46 +0200
Subject: [PATCH 2/3] adjust layout of Sessions and App passwords sections

---
 settings/css/settings.css | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 0af53cebf3..3df484c74b 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -38,8 +38,7 @@ input#openid, input#webdav { width:20em; }
 #displaynameform,
 #lostpassword,
 #groups,
-#passwordform,
-#language {
+#passwordform {
 	display: inline-block;
 	margin-bottom: 0;
 	padding-bottom: 0;
@@ -104,17 +103,17 @@ table.nostyle td { padding: 0.2em 0; }
 #apppasswords table {
 	width: 100%;
 	min-height: 150px;
-	padding-top: 25px;
+	padding-top: 5px;
 }
 #sessions table th,
 #apppasswords table th {
-	font-weight: 800;
+	opacity: .5;
 }
 #sessions table th,
 #sessions table td,
 #apppasswords table th,
 #apppasswords table td {
-	padding: 10px;
+	padding: 10px 10px 10px 0;
 }
 
 #sessions .token-list td,

From 9b22be2023bd441e4a54e9a5f1be85be421c0341 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 19 Jul 2016 11:42:57 +0200
Subject: [PATCH 3/3] =?UTF-8?q?set=20max=20width=20for=20sessions=20tables?=
 =?UTF-8?q?=20so=20it=20doesn=E2=80=99t=20go=20crazy=20on=20large=20screen?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings/css/settings.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 3df484c74b..a190cd91b0 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -104,6 +104,7 @@ table.nostyle td { padding: 0.2em 0; }
 	width: 100%;
 	min-height: 150px;
 	padding-top: 5px;
+	max-width: 580px;
 }
 #sessions table th,
 #apppasswords table th {