Merge branch 'dev' into feature-merge-tool

src-ui/src/app/components/app-frame/app-frame.component.html

@@ -31,7 +31,7 @@
       </button>
       <div ngbDropdownMenu class="dropdown-menu-right shadow mr-2" aria-labelledby="userDropdown">
         <div *ngIf="displayName" class="d-sm-none">
-          <p class="small mb-0 px-3" i18n>Logged in as {{displayName}}</p>
+          <p class="small mb-0 px-3 text-muted" i18n>Logged in as {{displayName}}</p>
           <div class="dropdown-divider"></div>
         </div>
         <a ngbDropdownItem class="nav-link" routerLink="settings" (click)="closeMenu()">

src-ui/src/app/components/manage/logs/logs.component.html

@@ -14,5 +14,5 @@
 <div class="bg-dark p-3 mb-3 text-light text-monospace log-container">
   <p
     class="m-0 p-0 log-entry-{{getLogLevel(log)}}"
-    *ngFor="let log of logs" style="white-space: pre;">{{log}}</p>
+    *ngFor="let log of logs">{{log}}</p>
 </div>

src-ui/src/app/components/manage/logs/logs.component.scss

@@ -16,9 +16,11 @@
 }
 
 .log-container {
-
-  overflow: scroll;
-
+  overflow-y: scroll;
   height: calc(100vh - 190px);
   top: 70px;
-}
+
+  p {
+    white-space: pre-wrap;
+  }
+}

src-ui/src/locale/messages.en_GB.xlf

@@ -1273,7 +1273,7 @@
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
           <context context-type="linenumber">57</context>
         </context-group>
-        <target state="needs-translation">ASN: <x id="PH" equiv-text="rule.value"/></target>
+        <target state="translated">ASN: <x id="PH" equiv-text="rule.value"/></target>
       </trans-unit>
       <trans-unit id="02d184c288f567825a1fcbf83bcd3099a10853d5" datatype="html">
         <source>Filter tags</source>

src/locale/de_DE/LC_MESSAGES/django.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: paperless-ng\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-07 21:34+0100\n"
-"PO-Revision-Date: 2021-03-07 21:35\n"
+"PO-Revision-Date: 2021-03-10 23:00\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
 "Language: de_DE\n"
@@ -390,7 +390,7 @@ msgstr "Bitte melden Sie sich an."
 
 #: documents/templates/registration/login.html:45
 msgid "Your username and password didn't match. Please try again."
-msgstr "Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es erneut."
+msgstr "Ihr Benutzername und Kennwort stimmen nicht überein. Bitte versuchen Sie es erneut."
 
 #: documents/templates/registration/login.html:48
 msgid "Username"
@@ -398,7 +398,7 @@ msgstr "Benutzername"
 
 #: documents/templates/registration/login.html:49
 msgid "Password"
-msgstr "Passwort"
+msgstr "Kennwort"
 
 #: documents/templates/registration/login.html:54
 msgid "Sign in"
@@ -514,7 +514,7 @@ msgstr "Benutzername"
 
 #: paperless_mail/models.py:50
 msgid "password"
-msgstr "Passwort"
+msgstr "Kennwort"
 
 #: paperless_mail/models.py:60
 msgid "mail rule"